From: Stefan Metzmacher <metze@samba.org>
Date: Wed, 15 Sep 2004 13:57:33 +0000 (+0000)
Subject: r2348: fix segmention faults
X-Git-Tag: samba-misc-tags/initial-v3-0-unstable~5806
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=39f3f76ea2097c10799f0bef8717d3ac71cacaa8;p=thirdparty%2Fsamba.git

r2348: fix segmention faults

in smbcquotas and smbcacls caused by setup_logging() (-r 1425)

metze
---

diff --git a/source/utils/smbcacls.c b/source/utils/smbcacls.c
index cb82ad831eb..4dc89aecb9d 100644
--- a/source/utils/smbcacls.c
+++ b/source/utils/smbcacls.c
@@ -761,11 +761,13 @@ static struct cli_state *connect_one(const char *share)
 
 	ctx=talloc_init("main");
 
-	setlinebuf(stdout);
-
+	/* set default debug level to 0 regardless of what smb.conf sets */
+	setup_logging( "smbcacls", True );
+	DEBUGLEVEL_CLASS[DBGC_ALL] = 1;
 	dbf = x_stderr;
+	x_setbuf( x_stderr, NULL );
 
-	setup_logging(argv[0],True);
+	setlinebuf(stdout);
 
 	lp_load(dyn_CONFIGFILE,True,False,False);
 	load_interfaces();
diff --git a/source/utils/smbcquotas.c b/source/utils/smbcquotas.c
index 0bd87554209..98d214706ad 100644
--- a/source/utils/smbcquotas.c
+++ b/source/utils/smbcquotas.c
@@ -419,14 +419,15 @@ FSQFLAGS:QUOTA_ENABLED/DENY_DISK/LOG_SOFTLIMIT/LOG_HARD_LIMIT", "SETSTRING" },
 
 	ZERO_STRUCT(qt);
 
-	setlinebuf(stdout);
-
+	/* set default debug level to 1 regardless of what smb.conf sets */
+	setup_logging( "smbcquotas", True );
+	DEBUGLEVEL_CLASS[DBGC_ALL] = 1;
 	dbf = x_stderr;
+	x_setbuf( x_stderr, NULL );
 
-	fault_setup(NULL);
-
-	setup_logging(argv[0],True);
+	setlinebuf(stdout);
 
+	fault_setup(NULL);
 
 	lp_load(dyn_CONFIGFILE,True,False,False);
 	load_interfaces();