s3:param: remove "global_only" parameter from lp_load_with_registry_shares().

There is no point in choosing global_only when forcing to load
all shares from registry at the same time...

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

diff --git a/source3/include/proto.h b/source3/include/proto.h
index 89e6429fca291c84c7b01d9b39b64f970b211f72..8a1fc8726bedfe400bf153af1d06ad3f4034c599 100644 (file)
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -1068,7 +1068,6 @@ bool lp_load_client(const char *file_name);
 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 global_only,
                                  bool save_defaults,
                                  bool add_ipc,
                                  bool initialize_globals);

diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index 4117872db8adb624332c63ef309e397e5d760b48..aa5f90fc3bd123c3d66a8e243b6b621aa47e6327 100644 (file)
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -3886,13 +3886,12 @@ bool lp_load_client_no_reinit(const char *file_name)
 }
 
 bool lp_load_with_registry_shares(const char *pszFname,
-                                 bool global_only,
                                  bool save_defaults,
                                  bool add_ipc,
                                  bool initialize_globals)
 {
        return lp_load_ex(pszFname,
-                         global_only,
+                         false, /* global_only */
                          save_defaults,
                          add_ipc,
                          initialize_globals,

diff --git a/source3/param/test_lp_load.c b/source3/param/test_lp_load.c
index 45427ceab3e9bd110735f2aaaefc9c22db0c1778..bd5c2b9ba8403c44a58982c10c695a1637f534b7 100644 (file)
--- a/source3/param/test_lp_load.c
+++ b/source3/param/test_lp_load.c
@@ -62,7 +62,6 @@ int main(int argc, const char **argv)
        for (i=0; i < count; i++) {
                printf("call lp_load() #%d: ", i+1);
                if (!lp_load_with_registry_shares(config_file,
-                                                 False, /* global only */
                                                  True,  /* save defaults */
                                                  False, /*add_ipc */
                                                  True)) /*init globals */

diff --git a/source3/utils/sharesec.c b/source3/utils/sharesec.c
index ff5400ed4555608a1634de59e8e4564e2281412a..4c6e205e6a1ccc3eb631baf9710e2a2b35c781ea 100644 (file)
--- a/source3/utils/sharesec.c
+++ b/source3/utils/sharesec.c
@@ -599,8 +599,7 @@ int main(int argc, const char *argv[])
 
        setlinebuf(stdout);
 
-       lp_load_with_registry_shares( get_dyn_CONFIGFILE(), False, False, False,
-                                     True );
+       lp_load_with_registry_shares(get_dyn_CONFIGFILE(), False, False, True);
 
        /* check for initializing secrets.tdb first */
 

diff --git a/source3/utils/testparm.c b/source3/utils/testparm.c
index 9499f862673fe93086370cf690e62297dd8256cf..cec7dd48db07d8cc68679ea92a741b306783a05f 100644 (file)
--- 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,False,True,False,True)) {
+       if (!lp_load_with_registry_shares(config_file, True, False, True)) {
                fprintf(stderr,"Error loading services.\n");
                ret = 1;
                goto done;