summaryrefslogtreecommitdiffstats
path: root/source/client
diff options
context:
space:
mode:
authorHerb Lewis <herb@samba.org>2002-01-07 21:32:22 +0000
committerHerb Lewis <herb@samba.org>2002-01-07 21:32:22 +0000
commit39d6b31e14144a3ff4b992d4286b706147e58566 (patch)
tree0782bd2ea27fc9bde828c0a91f64938159e47b05 /source/client
parent2fcdc520cee051631bbc2a0c06466d231390f8d5 (diff)
downloadsamba-39d6b31e14144a3ff4b992d4286b706147e58566.tar.gz
samba-39d6b31e14144a3ff4b992d4286b706147e58566.tar.xz
samba-39d6b31e14144a3ff4b992d4286b706147e58566.zip
merge changes from 2.2 branch to prevent smb.conf from changing debug level
of commands when specified on command line.
Diffstat (limited to 'source/client')
-rw-r--r--source/client/client.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/source/client/client.c b/source/client/client.c
index bf0e0f6b04c..33ce7e30f74 100644
--- a/source/client/client.c
+++ b/source/client/client.c
@@ -32,6 +32,7 @@ const char prog_name[] = "smbclient";
struct cli_state *cli;
extern BOOL in_client;
+extern BOOL AllowDebugChange;
static int port = 0;
pstring cur_dir = "\\";
pstring cd_path = "";
@@ -2411,6 +2412,7 @@ static int do_message_op(void)
*new_name_resolve_order = 0;
DEBUGLEVEL = 2;
+ AllowDebugChange = False;
setup_logging(pname,True);