From f1256e847e6820c29f8bc74db4609d8aa282a1a1 Mon Sep 17 00:00:00 2001 From: Herb Lewis Date: Mon, 7 Jan 2002 21:32:22 +0000 Subject: 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) --- source3/utils/pdbedit.c | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'source3/utils/pdbedit.c') diff --git a/source3/utils/pdbedit.c b/source3/utils/pdbedit.c index ab7c9d6f7c1..046d4a4ad80 100644 --- a/source3/utils/pdbedit.c +++ b/source3/utils/pdbedit.c @@ -32,6 +32,7 @@ #include "includes.h" extern pstring global_myname; +extern BOOL AllowDebugChange; /* * Next two lines needed for SunOS and don't @@ -568,6 +569,9 @@ int main (int argc, char **argv) exit(1); } + DEBUGLEVEL = 1; + AllowDebugChange = False; + if (!lp_load(dyn_CONFIGFILE,True,False,False)) { fprintf(stderr, "Can't load %s - run testparm to debug it\n", dyn_CONFIGFILE); -- cgit