s3:param: let lp_load_global() call lp_load(), not lp_load_ex().

Signed-off-by: Michael Adam <obnox@samba.org>
Reviewed-by: Ira Cooper <ira@samba.org>

diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index a6b3b45f949ed86a5de7fea1d8223d9efa87abac..6059f038cd658e170024481e5f2a0dc652548166 100644 (file)
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -3830,13 +3830,11 @@ bool lp_load_initial_only(const char *pszFname)
  */
 bool lp_load_global(const char *file_name)
 {
-       return lp_load_ex(file_name,
-                         true,   /* global_only */
-                         false,  /* save_defaults */
-                         false,  /* add_ipc */
-                         true,   /* initialize_globals */
-                         true,   /* allow_include_registry */
-                         false); /* load_all_shares*/
+       return lp_load(file_name,
+                      true,   /* global_only */
+                      false,  /* save_defaults */
+                      false,  /* add_ipc */
+                      true);  /* initialize_globals */
 }
 
 /**