s3:param: let lp_load_global_no_reinit() call lp_load() instead of lp_load_ex()
authorMichael Adam <obnox@samba.org>
Wed, 30 Jul 2014 14:52:06 +0000 (16:52 +0200)
committerIra Cooper <ira@samba.org>
Wed, 22 Apr 2015 11:57:29 +0000 (13:57 +0200)
Signed-off-by: Michael Adam <obnox@samba.org>
Reviewed-by: Ira Cooper <ira@samba.org>
source3/param/loadparm.c

index 2b0bfee9958d3571bfe231ab34f91df6e8ec6a41..4117872db8adb624332c63ef309e397e5d760b48 100644 (file)
@@ -3868,13 +3868,11 @@ bool lp_load_client(const char *file_name)
  */
 bool lp_load_global_no_reinit(const char *file_name)
 {
-       return lp_load_ex(file_name,
-                         true,   /* global_only */
-                         false,  /* save_defaults */
-                         false,  /* add_ipc */
-                         false,  /* initialize_globals */
-                         true,   /* allow_include_registry */
-                         false); /* load_all_shares*/
+       return lp_load(file_name,
+                      true,   /* global_only */
+                      false,  /* save_defaults */
+                      false,  /* add_ipc */
+                      false); /* initialize_globals */
 }
 
 /**