summaryrefslogtreecommitdiffstats
path: root/source/torture/torture.c
diff options
context:
space:
mode:
authorDerrell Lipman <derrell@samba.org>2006-01-28 22:53:04 +0000
committerDerrell Lipman <derrell@samba.org>2006-01-28 22:53:04 +0000
commit8e40f54fbc0f18732b98730c16022923b37c65b7 (patch)
tree7fec57191368a498282d032819b76fc9dbd97bbe /source/torture/torture.c
parent6c1e874935c285a278ae18351b4bde309ba32bca (diff)
downloadsamba-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/torture/torture.c')
-rw-r--r--source/torture/torture.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/source/torture/torture.c b/source/torture/torture.c
index e995c3cc58a..0b3bfc18f4a 100644
--- a/source/torture/torture.c
+++ b/source/torture/torture.c
@@ -4916,7 +4916,7 @@ static void usage(void)
load_case_tables();
- lp_load(dyn_CONFIGFILE,True,False,False);
+ lp_load(dyn_CONFIGFILE,True,False,False,True);
load_interfaces();
if (argc < 2) {