diff options
| -rw-r--r-- | source3/include/proto.h | 1 | ||||
| -rw-r--r-- | source3/param/loadparm.c | 3 | ||||
| -rw-r--r-- | source3/param/test_lp_load.c | 1 | ||||
| -rw-r--r-- | source3/utils/sharesec.c | 2 | ||||
| -rw-r--r-- | source3/utils/testparm.c | 2 |
5 files changed, 3 insertions, 6 deletions
diff --git a/source3/include/proto.h b/source3/include/proto.h index 8a1fc8726be..ea5fb048b19 100644 --- a/source3/include/proto.h +++ b/source3/include/proto.h @@ -1069,7 +1069,6 @@ bool lp_load_global_no_reinit(const char *file_name); bool lp_load_client_no_reinit(const char *file_name); bool lp_load_with_registry_shares(const char *pszFname, bool save_defaults, - bool add_ipc, bool initialize_globals); int lp_numservices(void); void lp_dump(FILE *f, bool show_defaults, int maxtoprint); diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c index aa5f90fc3bd..672155bdfde 100644 --- a/source3/param/loadparm.c +++ b/source3/param/loadparm.c @@ -3887,13 +3887,12 @@ bool lp_load_client_no_reinit(const char *file_name) bool lp_load_with_registry_shares(const char *pszFname, bool save_defaults, - bool add_ipc, bool initialize_globals) { return lp_load_ex(pszFname, false, /* global_only */ save_defaults, - add_ipc, + false, /* add_ipc */ initialize_globals, true, /* allow_include_registry */ true); /* load_all_shares*/ diff --git a/source3/param/test_lp_load.c b/source3/param/test_lp_load.c index bd5c2b9ba84..bd373b9e354 100644 --- a/source3/param/test_lp_load.c +++ b/source3/param/test_lp_load.c @@ -63,7 +63,6 @@ int main(int argc, const char **argv) printf("call lp_load() #%d: ", i+1); if (!lp_load_with_registry_shares(config_file, True, /* save defaults */ - False, /*add_ipc */ True)) /*init globals */ { printf("ERROR.\n"); diff --git a/source3/utils/sharesec.c b/source3/utils/sharesec.c index 4c6e205e6a1..914cc4fe429 100644 --- a/source3/utils/sharesec.c +++ b/source3/utils/sharesec.c @@ -599,7 +599,7 @@ int main(int argc, const char *argv[]) setlinebuf(stdout); - lp_load_with_registry_shares(get_dyn_CONFIGFILE(), False, False, True); + lp_load_with_registry_shares(get_dyn_CONFIGFILE(), False, True); /* check for initializing secrets.tdb first */ diff --git a/source3/utils/testparm.c b/source3/utils/testparm.c index cec7dd48db0..3cef0d6a62e 100644 --- a/source3/utils/testparm.c +++ b/source3/utils/testparm.c @@ -491,7 +491,7 @@ static void do_per_share_checks(int s) fprintf(stderr,"Load smb config files from %s\n",config_file); - if (!lp_load_with_registry_shares(config_file, True, False, True)) { + if (!lp_load_with_registry_shares(config_file, True, True)) { fprintf(stderr,"Error loading services.\n"); ret = 1; goto done; |