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

derrell at samba.org derrell at samba.org
Sun Dec 25 04:17:34 GMT 2005


Author: derrell
Date: 2005-12-25 04:17:32 +0000 (Sun, 25 Dec 2005)
New Revision: 12471

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

Log:
 r12038 at cabra:  derrell | 2005-12-24 23:17:16 -0500
 libsmbclient was not loading the global configuration file.  This should fix 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:12033
   + 3a72dc49-98ff-0310-ab52-9b7ed7945d91:/local/samba3:12038

Modified: branches/SAMBA_3_0/source/libsmb/libsmbclient.c
===================================================================
--- branches/SAMBA_3_0/source/libsmb/libsmbclient.c	2005-12-25 03:04:13 UTC (rev 12470)
+++ branches/SAMBA_3_0/source/libsmb/libsmbclient.c	2005-12-25 04:17:32 UTC (rev 12471)
@@ -5673,6 +5673,11 @@
 
                 /* 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 */



More information about the samba-cvs mailing list