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/client | |
| 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/client')
| -rw-r--r-- | source3/client/client.c | 2 | ||||
| -rw-r--r-- | source3/client/smbctool.c | 2 | ||||
| -rw-r--r-- | source3/client/smbmount.c | 2 | ||||
| -rw-r--r-- | source3/client/smbspool.c | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/source3/client/client.c b/source3/client/client.c index 7ac64970f8..403074b22b 100644 --- a/source3/client/client.c +++ b/source3/client/client.c @@ -3449,7 +3449,7 @@ static int do_message_op(void) if ( override_logfile ) setup_logging( lp_logfile(), False ); - if (!lp_load(dyn_CONFIGFILE,True,False,False)) { + if (!lp_load(dyn_CONFIGFILE,True,False,False,True)) { fprintf(stderr, "%s: Can't load %s - run testparm to debug it\n", argv[0], dyn_CONFIGFILE); } diff --git a/source3/client/smbctool.c b/source3/client/smbctool.c index db938dd809..439345ca6d 100644 --- a/source3/client/smbctool.c +++ b/source3/client/smbctool.c @@ -3654,7 +3654,7 @@ static int do_message_op(void) if ( override_logfile ) setup_logging( lp_logfile(), False ); - if (!lp_load(dyn_CONFIGFILE,True,False,False)) { + if (!lp_load(dyn_CONFIGFILE,True,False,False,True)) { fprintf(stderr, "%s: Can't load %s - run testparm to debug it\n", argv[0], dyn_CONFIGFILE); } diff --git a/source3/client/smbmount.c b/source3/client/smbmount.c index d8254ef23a..21882ab2e9 100644 --- a/source3/client/smbmount.c +++ b/source3/client/smbmount.c @@ -910,7 +910,7 @@ static void parse_mount_smb(int argc, char **argv) pstrcpy(username,getenv("LOGNAME")); } - if (!lp_load(dyn_CONFIGFILE,True,False,False)) { + if (!lp_load(dyn_CONFIGFILE,True,False,False,True)) { fprintf(stderr, "Can't load %s - run testparm to debug it\n", dyn_CONFIGFILE); } diff --git a/source3/client/smbspool.c b/source3/client/smbspool.c index 7fe918413d..d7a02b76f9 100644 --- a/source3/client/smbspool.c +++ b/source3/client/smbspool.c @@ -214,7 +214,7 @@ static int smb_print(struct cli_state *, char *, FILE *); in_client = True; /* Make sure that we tell lp_load we are */ - if (!lp_load(dyn_CONFIGFILE, True, False, False)) + if (!lp_load(dyn_CONFIGFILE, True, False, False, True)) { fprintf(stderr, "ERROR: Can't load %s - run testparm to debug it\n", dyn_CONFIGFILE); return (1); |