diff options
| author | Herb Lewis <herb@samba.org> | 2002-01-07 21:32:22 +0000 |
|---|---|---|
| committer | Herb Lewis <herb@samba.org> | 2002-01-07 21:32:22 +0000 |
| commit | f1256e847e6820c29f8bc74db4609d8aa282a1a1 (patch) | |
| tree | ef8ffff0a67d9d129e950259df11f803c8a05d48 /source3/utils/smbcontrol.c | |
| parent | bff833e76af390557428ba6aabdbc635b2c120e9 (diff) | |
| download | samba-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/smbcontrol.c')
| -rw-r--r-- | source3/utils/smbcontrol.c | 5 |
1 files changed, 5 insertions, 0 deletions
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); |