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/smbcontrol.c | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'source3/utils/smbcontrol.c') diff --git a/source3/utils/smbcontrol.c b/source3/utils/smbcontrol.c index 3562caf532..f03387c6e0 100644 --- a/source3/utils/smbcontrol.c +++ b/source3/utils/smbcontrol.c @@ -22,6 +22,8 @@ #include "includes.h" +extern BOOL AllowDebugChange; + static struct { char *name; int value; @@ -423,6 +425,9 @@ static BOOL do_command(char *dest, char *msg_name, int iparams, char **params) extern int optind; BOOL interactive = False; + AllowDebugChange = False; + DEBUGLEVEL = 0; + setup_logging(argv[0],True); if (argc < 2) usage(True); -- cgit