summaryrefslogtreecommitdiff
path: root/source3/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
commitf1256e847e6820c29f8bc74db4609d8aa282a1a1 (patch)
treeef8ffff0a67d9d129e950259df11f803c8a05d48 /source3/client
parentbff833e76af390557428ba6aabdbc635b2c120e9 (diff)
downloadsamba-f1256e847e6820c29f8bc74db4609d8aa282a1a1.tar.gz
samba-f1256e847e6820c29f8bc74db4609d8aa282a1a1.tar.bz2
samba-f1256e847e6820c29f8bc74db4609d8aa282a1a1.zip
merge changes from 2.2 branch to prevent smb.conf from changing debug level
of commands when specified on command line. (This used to be commit 39d6b31e14144a3ff4b992d4286b706147e58566)
Diffstat (limited to 'source3/client')
-rw-r--r--source3/client/client.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/source3/client/client.c b/source3/client/client.c
index bf0e0f6b04..33ce7e30f7 100644
--- a/source3/client/client.c
+++ b/source3/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);