diff options
| author | Derrell Lipman <derrell@samba.org> | 2006-01-28 22:53:04 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 11:06:18 -0500 |
| commit | 9c15bd311db76885b27f30ba92d885833f668550 (patch) | |
| tree | 20ec704d6d0caa99936d86d32869917592be3b8d /source3/nsswitch | |
| parent | ba611cb0368629dd7b98c20ed88e9394be0c29e5 (diff) | |
| download | samba-9c15bd311db76885b27f30ba92d885833f668550.tar.gz samba-9c15bd311db76885b27f30ba92d885833f668550.tar.bz2 samba-9c15bd311db76885b27f30ba92d885833f668550.zip | |
r13212: r12414@cabra: derrell | 2006-01-28 17:52:17 -0500
lp_load() could not be called multiple times to modify parameter settings based
on reading from multiple configuration settings. Each time, it initialized all
of the settings back to their defaults before reading the specified
configuration file.
This patch adds a parameter to lp_load() specifying whether the settings should
be initialized. It does, however, still force the settings to be initialized
the first time, even if the request was to not initialize them. (Not doing so
could wreak havoc due to uninitialized values.)
(This used to be commit f2a24de769d1b2266e576597c57a8e3b1e2a2b51)
Diffstat (limited to 'source3/nsswitch')
| -rw-r--r-- | source3/nsswitch/wbinfo.c | 2 | ||||
| -rw-r--r-- | source3/nsswitch/winbindd.c | 2 | ||||
| -rw-r--r-- | source3/nsswitch/wins.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/source3/nsswitch/wbinfo.c b/source3/nsswitch/wbinfo.c index f3819b6f51..b7c3b0a98c 100644 --- a/source3/nsswitch/wbinfo.c +++ b/source3/nsswitch/wbinfo.c @@ -1024,7 +1024,7 @@ int main(int argc, char **argv) /* Samba client initialisation */ load_case_tables(); - if (!lp_load(dyn_CONFIGFILE, True, False, False)) { + if (!lp_load(dyn_CONFIGFILE, True, False, False, True)) { d_fprintf(stderr, "wbinfo: error opening config file %s. Error was %s\n", dyn_CONFIGFILE, strerror(errno)); exit(1); diff --git a/source3/nsswitch/winbindd.c b/source3/nsswitch/winbindd.c index e9b9ed42c4..bbcf2b5e88 100644 --- a/source3/nsswitch/winbindd.c +++ b/source3/nsswitch/winbindd.c @@ -47,7 +47,7 @@ static BOOL reload_services_file(void) } reopen_logs(); - ret = lp_load(dyn_CONFIGFILE,False,False,True); + ret = lp_load(dyn_CONFIGFILE,False,False,True,True); reopen_logs(); load_interfaces(); diff --git a/source3/nsswitch/wins.c b/source3/nsswitch/wins.c index ac5b0f1157..f871a53982 100644 --- a/source3/nsswitch/wins.c +++ b/source3/nsswitch/wins.c @@ -80,7 +80,7 @@ static void nss_wins_init(void) TimeInit(); setup_logging("nss_wins",False); - lp_load(dyn_CONFIGFILE,True,False,False); + lp_load(dyn_CONFIGFILE,True,False,False,True); load_interfaces(); } |