diff options
| author | Derrell Lipman <derrell@samba.org> | 2006-01-28 22:53:04 +0000 |
|---|---|---|
| committer | Derrell Lipman <derrell@samba.org> | 2006-01-28 22:53:04 +0000 |
| commit | 8e40f54fbc0f18732b98730c16022923b37c65b7 (patch) | |
| tree | 7fec57191368a498282d032819b76fc9dbd97bbe /source/nsswitch | |
| parent | 6c1e874935c285a278ae18351b4bde309ba32bca (diff) | |
| download | samba-8e40f54fbc0f18732b98730c16022923b37c65b7.tar.gz samba-8e40f54fbc0f18732b98730c16022923b37c65b7.tar.xz samba-8e40f54fbc0f18732b98730c16022923b37c65b7.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.)
Diffstat (limited to 'source/nsswitch')
| -rw-r--r-- | source/nsswitch/wbinfo.c | 2 | ||||
| -rw-r--r-- | source/nsswitch/winbindd.c | 2 | ||||
| -rw-r--r-- | source/nsswitch/wins.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/source/nsswitch/wbinfo.c b/source/nsswitch/wbinfo.c index f3819b6f519..b7c3b0a98c5 100644 --- a/source/nsswitch/wbinfo.c +++ b/source/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/source/nsswitch/winbindd.c b/source/nsswitch/winbindd.c index e9b9ed42c4f..bbcf2b5e887 100644 --- a/source/nsswitch/winbindd.c +++ b/source/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/source/nsswitch/wins.c b/source/nsswitch/wins.c index ac5b0f11572..f871a53982e 100644 --- a/source/nsswitch/wins.c +++ b/source/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(); } |