summaryrefslogtreecommitdiff
path: root/source3/utils/status.c
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/utils/status.c
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/utils/status.c')
-rw-r--r--source3/utils/status.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/source3/utils/status.c b/source3/utils/status.c
index e17a6589ef..98e601382b 100644
--- a/source3/utils/status.c
+++ b/source3/utils/status.c
@@ -36,6 +36,8 @@
#include "includes.h"
+extern BOOL AllowDebugChange;
+
struct session_record{
pid_t pid;
uid_t uid;
@@ -550,6 +552,7 @@ static int traverse_sessionid(TDB_CONTEXT *tdb, TDB_DATA kbuf, TDB_DATA dbuf, vo
setup_logging(argv[0],True);
+ AllowDebugChange = False;
DEBUGLEVEL = 0;
dbf = x_stderr;