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 cb82ad831eb6e713c0428edbeed28d5560ff7622..4dc89aecb9de4fb5f7766c982b3969d8d34de5f6 100644 (file)
--- 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 0bd8755420991fe9fb3afc62cbd56c6bde00336a..98d214706ad6acd9775280f56845c59682083271 100644 (file)
--- 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();