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/pdbedit.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/pdbedit.c')
| -rw-r--r-- | source3/utils/pdbedit.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/source3/utils/pdbedit.c b/source3/utils/pdbedit.c index ab7c9d6f7c..046d4a4ad8 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); |