svn commit: samba r2349 - in trunk/source/utils: .

[metze at samba.org]

Author: metze
Date: 2004-09-15 14:01:26 +0000 (Wed, 15 Sep 2004)
New Revision: 2349

WebSVN: http://websvn.samba.org/websvn/changeset.php?rep=samba&path=/trunk/source/utils&rev=2349&nolog=1

Log:
merge from 3.0: -r 2348:
fix segmention faults

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

metze

Modified:
   trunk/source/utils/smbcacls.c
   trunk/source/utils/smbcquotas.c


Changeset:
Modified: trunk/source/utils/smbcacls.c
===================================================================
--- trunk/source/utils/smbcacls.c	2004-09-15 13:57:33 UTC (rev 2348)
+++ trunk/source/utils/smbcacls.c	2004-09-15 14:01:26 UTC (rev 2349)
@@ -761,11 +761,13 @@
 
 	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();

Modified: trunk/source/utils/smbcquotas.c
===================================================================
--- trunk/source/utils/smbcquotas.c	2004-09-15 13:57:33 UTC (rev 2348)
+++ trunk/source/utils/smbcquotas.c	2004-09-15 14:01:26 UTC (rev 2349)
@@ -419,15 +419,16 @@
 
 	ZERO_STRUCT(qt);
 
+	/* 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 );
+
 	setlinebuf(stdout);
 
-	dbf = x_stderr;
-
 	fault_setup(NULL);
 
-	setup_logging(argv[0],True);
-
-
 	lp_load(dyn_CONFIGFILE,True,False,False);
 	load_interfaces();