From f1256e847e6820c29f8bc74db4609d8aa282a1a1 Mon Sep 17 00:00:00 2001
From: Herb Lewis <herb@samba.org>
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/nmblookup.c | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'source3/utils/nmblookup.c')

diff --git a/source3/utils/nmblookup.c b/source3/utils/nmblookup.c
index 5b22872cb37..db70cb302a5 100644
--- a/source3/utils/nmblookup.c
+++ b/source3/utils/nmblookup.c
@@ -24,6 +24,8 @@
 
 #include "includes.h"
 
+extern BOOL AllowDebugChange;
+
 static BOOL use_bcast = True;
 static BOOL got_bcast = False;
 static struct in_addr bcast_addr;
@@ -195,6 +197,9 @@ int main(int argc,char *argv[])
   int commandline_debuglevel = -2;
 
   DEBUGLEVEL = 1;
+  /* Prevent smb.conf setting from overridding */
+  AllowDebugChange = False;
+
   *lookup = 0;
 
   setup_logging(argv[0],True);
-- 
cgit