r12472: r12040@cabra: derrell | 2005-12-24 23:26:55 -0500
authorDerrell Lipman <derrell@samba.org>
Sun, 25 Dec 2005 04:26:59 +0000 (04:26 +0000)
committerGerald (Jerry) Carter <jerry@samba.org>
Wed, 10 Oct 2007 16:05:57 +0000 (11:05 -0500)
 revert immediately previous change and fix problem correctly.  Interfaces were being loaded before all configuration files had been read.  *This* should fix byg 3336.

source/libsmb/libsmbclient.c

index 635f280bee1aa7e53ac16d14a08a9243c5dcd8cf..d2d45a72284b3ecf37a90493cef236521f88bbfe 100644 (file)
@@ -5673,13 +5673,6 @@ SMBCCTX * smbc_init_context(SMBCCTX * context)
 
                 /* Here we would open the smb.conf file if needed ... */
                 
-                if (!lp_load(dyn_CONFIGFILE, True, False, False)) {
-                    DEBUG(5, ("Could not load config file: %s\n",
-                              dyn_CONFIGFILE));
-                }
-       
-                load_interfaces();  /* Load the list of interfaces ... */
-                
                 in_client = True; /* FIXME, make a param */
 
                 home = getenv("HOME");
@@ -5721,6 +5714,8 @@ SMBCCTX * smbc_init_context(SMBCCTX * context)
                         }
                 }
 
+                load_interfaces();  /* Load the list of interfaces ... */
+                
                 reopen_logs();  /* Get logging working ... */
         
                 /*