summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDerrell Lipman <derrell@samba.org>2005-12-25 04:26:59 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 11:05:57 -0500
commit3ec1852ae042b7bcc1b9ee58effb44bc49ffc415 (patch)
tree92d2f459d3009449882d9ec122fc36b9e6531287
parent50a06f76ef3feed4eec032f83ce86e9e207e003d (diff)
downloadsamba-3ec1852ae042b7bcc1b9ee58effb44bc49ffc415.tar.gz
samba-3ec1852ae042b7bcc1b9ee58effb44bc49ffc415.tar.bz2
samba-3ec1852ae042b7bcc1b9ee58effb44bc49ffc415.zip
r12472: r12040@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. (This used to be commit ded5fceef1e9086dcdaba1959f812810f04fe8bc)
-rw-r--r--source3/libsmb/libsmbclient.c9
1 files changed, 2 insertions, 7 deletions
diff --git a/source3/libsmb/libsmbclient.c b/source3/libsmb/libsmbclient.c
index 635f280bee..d2d45a7228 100644
--- a/source3/libsmb/libsmbclient.c
+++ b/source3/libsmb/libsmbclient.c
@@ -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 ... */
/*