r7530: Simply calling convention of lp_load().

This always loads all the services, as we now don't have an easy way
to split out smbd.

Andrew Bartlett

diff --git a/source/client/smbmount.c b/source/client/smbmount.c
index 7e9c74da57399dc525a76c63dc4fa61dd40f1fd0..45c5f703cea9b909ba536ab9cf1b2bab4eaac13b 100644 (file)
--- a/source/client/smbmount.c
+++ b/source/client/smbmount.c
@@ -898,7 +898,7 @@ static void parse_mount_smb(int argc, char **argv)
                pstrcpy(username,getenv("LOGNAME"));
        }
 
-       if (!lp_load(dyn_CONFIGFILE,True,False,False)) {
+       if (!lp_load(dyn_CONFIGFILE)) {
                fprintf(stderr, "Can't load %s - run testparm to debug it\n", 
                        dyn_CONFIGFILE);
        }

diff --git a/source/client/smbspool.c b/source/client/smbspool.c
index 620e4b301c1ac6c9f91cf6a97beea44e1e5119f1..41cb4c9bf30a53b48502d299e955f7230b470cfe 100644 (file)
--- a/source/client/smbspool.c
+++ b/source/client/smbspool.c
@@ -186,7 +186,7 @@ static int          smb_print(struct smbcli_state *, char *, FILE *);
 
   in_client = True;   /* Make sure that we tell lp_load we are */
 
-  if (!lp_load(dyn_CONFIGFILE, True, False, False))
+  if (!lp_load(dyn_CONFIGFILE))
   {
     fprintf(stderr, "ERROR: Can't load %s - run testparm to debug it\n", dyn_CONFIGFILE);
     return (1);

diff --git a/source/gtk/tools/gepdump.c b/source/gtk/tools/gepdump.c
index c5c1aa1af6033477327227a8badd817cd2502d62..4dacd2937c3bb93cf475526c23605d525b9e9fa3 100644 (file)
--- a/source/gtk/tools/gepdump.c
+++ b/source/gtk/tools/gepdump.c
@@ -463,7 +463,7 @@ static GtkWidget* create_mainwindow (void)
  int main(int argc, char **argv)
 {
        gepdump_init_subsystems;
-       lp_load(dyn_CONFIGFILE,True,False,False);
+       lp_load(dyn_CONFIGFILE);
        load_interfaces();
        setup_logging(argv[0], DEBUG_STDERR);
 

diff --git a/source/gtk/tools/gregedit.c b/source/gtk/tools/gregedit.c
index 9e81b0b86f8609e3a587705c130b2cf4511fb63c..72dd9ae929f1127061ef26f0e61d06444ad83af7 100644 (file)
--- a/source/gtk/tools/gregedit.c
+++ b/source/gtk/tools/gregedit.c
@@ -976,7 +976,7 @@ int main(int argc, char *argv[])
        int ret;
 
        gregedit_init_subsystems;
-       lp_load(dyn_CONFIGFILE,True,False,False);
+       lp_load(dyn_CONFIGFILE);
        load_interfaces();
        setup_logging(argv[0], DEBUG_STDERR);
 

diff --git a/source/gtk/tools/gwcrontab.c b/source/gtk/tools/gwcrontab.c
index 8cae7279a456e215cf512ac138626b784fda8558..eba8b54ac01f36b36bf3ca75904aa6589d09d75b 100644 (file)
--- a/source/gtk/tools/gwcrontab.c
+++ b/source/gtk/tools/gwcrontab.c
@@ -495,7 +495,7 @@ static GtkWidget*create_new_job_dialog (void)
  int main(int argc, char **argv)
 {
        gwcrontab_init_subsystems;
-       lp_load(dyn_CONFIGFILE,True,False,False);
+       lp_load(dyn_CONFIGFILE);
        load_interfaces();
        setup_logging(argv[0], DEBUG_STDERR);
 

diff --git a/source/gtk/tools/gwsam.c b/source/gtk/tools/gwsam.c
index d64f786ef8899ca3165293594d687b7cc9e96e19..cf82ddb7678b05bfd4e0328e12aefe65b92d826e 100644 (file)
--- a/source/gtk/tools/gwsam.c
+++ b/source/gtk/tools/gwsam.c
@@ -403,7 +403,7 @@ static GtkWidget* create_mainwindow (void)
  int main(int argc, char **argv)
 {
        gwsam_init_subsystems;
-       lp_load(dyn_CONFIGFILE,True,False,False);
+       lp_load(dyn_CONFIGFILE);
        load_interfaces();
        setup_logging(argv[0], DEBUG_STDERR);
 

diff --git a/source/lib/cmdline/popt_common.c b/source/lib/cmdline/popt_common.c
index fec85281ef86aeb8a28e7d607ba9769aa87d45fe..fb7356dc0e1bba02890c949e22bc9d599d21981a 100644 (file)
--- a/source/lib/cmdline/popt_common.c
+++ b/source/lib/cmdline/popt_common.c
@@ -52,7 +52,7 @@ static void popt_common_callback(poptContext con,
        if (reason == POPT_CALLBACK_REASON_POST) {
                /* Hook any 'every Samba program must do this, after
                 * the smb.conf is setup' functions here */
-               lp_load(dyn_CONFIGFILE,True,False,False);
+               lp_load(dyn_CONFIGFILE);
                load_interfaces();
                return;
        }

diff --git a/source/param/loadparm.c b/source/param/loadparm.c
index 15a054863f3849bf88ea010610e428ba6676f110..a546d5143844e0789662ffa7c4b8c2d0c755fb42 100644 (file)
--- a/source/param/loadparm.c
+++ b/source/param/loadparm.c
@@ -381,7 +381,6 @@ static service **ServicePtrs = NULL;
 static int iNumServices = 0;
 static int iServiceIndex = 0;
 static BOOL bInGlobalSection = True;
-static BOOL bGlobalOnly = False;
 static int server_role;
 static int default_server_announce;
 
@@ -2429,7 +2428,7 @@ BOOL lp_do_parameter(int snum, const char *pszParmName, const char *pszParmValue
 
 static BOOL do_parameter(const char *pszParmName, const char *pszParmValue)
 {
-       if (!bInGlobalSection && bGlobalOnly)
+       if (!bInGlobalSection)
                return (True);
 
        return (lp_do_parameter(bInGlobalSection ? -2 : iServiceIndex,
@@ -2632,7 +2631,7 @@ static BOOL do_section(const char *pszSectionName)
                return (True);
        }
 
-       if (!bInGlobalSection && bGlobalOnly)
+       if (!bInGlobalSection)
                return (True);
 
        /* if we have a current service, tidy it up before moving on */
@@ -2907,47 +2906,6 @@ void lp_killservice(int iServiceIn)
        }
 }
 
-/***************************************************************************
- Save the curent values of all global and sDefault parameters into the 
- defaults union. This allows swat and testparm to show only the
- changed (ie. non-default) parameters.
-***************************************************************************/
-
-static void lp_save_defaults(void)
-{
-       int i;
-       for (i = 0; parm_table[i].label; i++) {
-               if (i > 0 && parm_table[i].ptr == parm_table[i - 1].ptr)
-                       continue;
-               switch (parm_table[i].type) {
-                       case P_LIST:
-                               parm_table[i].def.lvalue = str_list_copy(talloc_autofree_context(), 
-                                                                        *(const char ***)parm_table[i].ptr);
-                               break;
-                       case P_STRING:
-                       case P_USTRING:
-                               if (parm_table[i].ptr) {
-                                       parm_table[i].def.svalue = strdup(*(char **)parm_table[i].ptr);
-                               } else {
-                                       parm_table[i].def.svalue = NULL;
-                               }
-                               break;
-                       case P_BOOL:
-                               parm_table[i].def.bvalue =
-                                       *(BOOL *)parm_table[i].ptr;
-                               break;
-                       case P_INTEGER:
-                       case P_ENUM:
-                               parm_table[i].def.ivalue =
-                                       *(int *)parm_table[i].ptr;
-                               break;
-                       case P_SEP:
-                               break;
-               }
-       }
-       defaults_saved = True;
-}
-
 /*******************************************************************
  Set the server type we will announce as via nmbd.
 ********************************************************************/
@@ -3010,8 +2968,7 @@ static void set_server_role(void)
  False on failure.
 ***************************************************************************/
 
-BOOL lp_load(const char *pszFname, BOOL global_only, BOOL save_defaults,
-            BOOL add_ipc)
+BOOL lp_load(const char *pszFname)
 {
        pstring n2;
        BOOL bRetval;
@@ -3027,7 +2984,6 @@ BOOL lp_load(const char *pszFname, BOOL global_only, BOOL save_defaults,
        DEBUG(2, ("lp_load: refreshing parameters from %s\n", pszFname));
        
        bInGlobalSection = True;
-       bGlobalOnly = global_only;
 
        if (Globals.param_opt != NULL) {
                struct param_opt *next;
@@ -3043,11 +2999,6 @@ BOOL lp_load(const char *pszFname, BOOL global_only, BOOL save_defaults,
        
        init_globals();
 
-       if (save_defaults)
-       {
-               lp_save_defaults();
-       }
-
        /* We get sections first, so have to start 'behind' to make up */
        iServiceIndex = -1;
        bRetval = pm_process(n2, do_section, do_parameter);
@@ -3060,12 +3011,10 @@ BOOL lp_load(const char *pszFname, BOOL global_only, BOOL save_defaults,
 
        lp_add_auto_services(lp_auto_services());
 
-       if (add_ipc) {
-               /* When 'restrict anonymous = 2' guest connections to ipc$
-                  are denied */
-               lp_add_hidden("IPC$", "IPC", (lp_restrict_anonymous() < 2));
-               lp_add_hidden("ADMIN$", "DISK", False);
-       }
+       /* When 'restrict anonymous = 2' guest connections to ipc$
+          are denied */
+       lp_add_hidden("IPC$", "IPC", (lp_restrict_anonymous() < 2));
+       lp_add_hidden("ADMIN$", "DISK", False);
 
        set_server_role();
        set_default_server_announce_type();

diff --git a/source/scripting/ejs/smbscript.c b/source/scripting/ejs/smbscript.c
index 68d94f6d2a644f0d41d589f71e01ee8e9a9c480e..2795e4f127847b1691fdbbd2573a8029dcf5a452 100644 (file)
--- a/source/scripting/ejs/smbscript.c
+++ b/source/scripting/ejs/smbscript.c
@@ -49,7 +49,7 @@ void ejs_exception(const char *reason)
 
        setup_logging(argv[0],DEBUG_STDOUT);
 
-       if (!lp_load(dyn_CONFIGFILE, False, False, False)) {
+       if (!lp_load(dyn_CONFIGFILE)) {
                fprintf(stderr, "%s: Can't load %s - run testparm to debug it\n",
                        argv[0], dyn_CONFIGFILE);
                exit(127);

diff --git a/source/torture/gentest.c b/source/torture/gentest.c
index fce36188af137fbfe0c070a0466eaf90b98c7f22..1baad252904751ea4ac5b19e117e858b1bc8b99b 100644 (file)
--- a/source/torture/gentest.c
+++ b/source/torture/gentest.c
@@ -2127,7 +2127,7 @@ static void usage(void)
        argc -= NSERVERS;
        argv += NSERVERS;
 
-       lp_load(dyn_CONFIGFILE,True,False,False);
+       lp_load(dyn_CONFIGFILE);
        load_interfaces();
 
        servers[0].credentials = cli_credentials_init(talloc_autofree_context());

diff --git a/source/torture/locktest.c b/source/torture/locktest.c
index a655125344e54f60308c090010e1de423e194517..583ce8762406e582bd5f7bbf847ce9780023f96b 100644 (file)
--- a/source/torture/locktest.c
+++ b/source/torture/locktest.c
@@ -476,7 +476,7 @@ static void usage(void)
        argc -= NSERVERS;
        argv += NSERVERS;
 
-       lp_load(dyn_CONFIGFILE,True,False,False);
+       lp_load(dyn_CONFIGFILE);
        load_interfaces();
 
        servers[0] = cli_credentials_init(talloc_autofree_context());

diff --git a/source/torture/locktest2.c b/source/torture/locktest2.c
index 3eb3398bd17920feb671f9f1d92bd19fcff47cf8..aef45396eb610caf26b89dbec33fa761e1017d9d 100644 (file)
--- a/source/torture/locktest2.c
+++ b/source/torture/locktest2.c
@@ -484,7 +484,7 @@ static void usage(void)
        argc -= 4;
        argv += 4;
 
-       lp_load(dyn_CONFIGFILE,True,False,False);
+       lp_load(dyn_CONFIGFILE);
        load_interfaces();
 
        if (getenv("USER")) {

diff --git a/source/torture/masktest.c b/source/torture/masktest.c
index 21e22e91d8bf9c6b1d6be8a45f6054601f38c5bd..1536ddafd8b92d1911fcfd848d06f25e72bcb5d8 100644 (file)
--- a/source/torture/masktest.c
+++ b/source/torture/masktest.c
@@ -296,7 +296,7 @@ static void usage(void)
        argc -= 1;
        argv += 1;
 
-       lp_load(dyn_CONFIGFILE,True,False,False);
+       lp_load(dyn_CONFIGFILE);
        load_interfaces();
 
        credentials = cli_credentials_init(talloc_autofree_context());

diff --git a/source/torture/msgtest.c b/source/torture/msgtest.c
index fa21aa307cac3aeb3a56edd597a98f3a386af0d7..fa47eca1ba8e64a526d946d2f867dae6c7a8d5b4 100644 (file)
--- a/source/torture/msgtest.c
+++ b/source/torture/msgtest.c
@@ -41,7 +41,7 @@ void pong_message(int msg_type, pid_t src, void *buf, size_t len)
 
        setup_logging(argv[0], DEBUG_STDOUT);
        
-       lp_load(dyn_CONFIGFILE,False,False,False);
+       lp_load(dyn_CONFIGFILE);
 
        message_init();