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/smbpasswd.c | 3 +++
 1 file changed, 3 insertions(+)

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

diff --git a/source3/utils/smbpasswd.c b/source3/utils/smbpasswd.c
index ca1fe377d0..6a20e71d96 100644
--- a/source3/utils/smbpasswd.c
+++ b/source3/utils/smbpasswd.c
@@ -20,6 +20,7 @@
 #include "includes.h"
 
 extern pstring global_myname;
+extern BOOL AllowDebugChange;
 
 /*
  * Next two lines needed for SunOS and don't
@@ -566,6 +567,8 @@ static int process_nonroot(int argc, char *argv[])
 **********************************************************/
 int main(int argc, char **argv)
 {	
+	AllowDebugChange = False;
+
 #if defined(HAVE_SET_AUTH_PARAMETERS)
 	set_auth_parameters(argc, argv);
 #endif /* HAVE_SET_AUTH_PARAMETERS */
-- 
cgit