svn commit: samba r12472 - in branches/SAMBA_3_0: . source/libsmb

[derrell at samba.org]

Author: derrell
Date: 2005-12-25 04:26:59 +0000 (Sun, 25 Dec 2005)
New Revision: 12472

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=12472

Log:
 r12040 at cabra:  derrell | 2005-12-24 23:26:55 -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.

Modified:
   branches/SAMBA_3_0/
   branches/SAMBA_3_0/source/libsmb/libsmbclient.c


Changeset:

Property changes on: branches/SAMBA_3_0
___________________________________________________________________
Name: svk:merge
   - 3a72dc49-98ff-0310-ab52-9b7ed7945d91:/local/samba3:12038
   + 3a72dc49-98ff-0310-ab52-9b7ed7945d91:/local/samba3:12040

Modified: branches/SAMBA_3_0/source/libsmb/libsmbclient.c
===================================================================
--- branches/SAMBA_3_0/source/libsmb/libsmbclient.c	2005-12-25 04:17:32 UTC (rev 12471)
+++ branches/SAMBA_3_0/source/libsmb/libsmbclient.c	2005-12-25 04:26:59 UTC (rev 12472)
@@ -5673,13 +5673,6 @@
 
                 /* 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 @@
                         }
                 }
 
+                load_interfaces();  /* Load the list of interfaces ... */
+                
                 reopen_logs();  /* Get logging working ... */
         
                 /*