summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristopher R. Hertel <crh@samba.org>1998-08-03 03:50:07 +0000
committerChristopher R. Hertel <crh@samba.org>1998-08-03 03:50:07 +0000
commit8c372cf5e0ae9969b10a8b789a445787b1fd1d3b (patch)
tree4edecfe58ee4a3f0d24394671595a3bf085babdc
parentfeb16291aa1877818cc00a8ac54d9d68f5ab4559 (diff)
downloadsamba-8c372cf5e0ae9969b10a8b789a445787b1fd1d3b.tar.gz
samba-8c372cf5e0ae9969b10a8b789a445787b1fd1d3b.tar.bz2
samba-8c372cf5e0ae9969b10a8b789a445787b1fd1d3b.zip
This is the remaining set of changes needed to replace the changes lost
when Andrew and I were both working with util.c. I really don't know how I lost the autoconfigure changes (honest, I *did* run frequent updates). Chris -)----- (This used to be commit bedefc2066ac86199b29ccd7f65ad5f1d8a899c4)
-rw-r--r--source3/lib/debug.c18
1 files changed, 7 insertions, 11 deletions
diff --git a/source3/lib/debug.c b/source3/lib/debug.c
index e85643f259..476023a7ba 100644
--- a/source3/lib/debug.c
+++ b/source3/lib/debug.c
@@ -123,14 +123,12 @@ int sig_usr2( void )
DEBUG( 0, ( "Got SIGUSR2; set debug level to %d.\n", DEBUGLEVEL ) );
BlockSignals( False, SIGUSR2 );
+ CatchSignal( SIGUSR2, SIGNAL_CAST sig_usr2 );
-#ifndef DONT_REINSTALL_SIG
- signal( SIGUSR2, SIGNAL_CAST sig_usr2 );
-#endif
return( 0 );
} /* sig_usr2 */
-#endif /* SIGUSR1 */
-
+#endif /* SIGUSR2 */
+
#if defined(SIGUSR1)
/* ************************************************************************** **
* catch a sigusr1 - increase the debug log level.
@@ -148,9 +146,8 @@ int sig_usr1( void )
DEBUG( 0, ( "Got SIGUSR1; set debug level to %d.\n", DEBUGLEVEL ) );
BlockSignals( False, SIGUSR1 );
-#ifndef DONT_REINSTALL_SIG
- signal( SIGUSR1, SIGNAL_CAST sig_usr1 );
-#endif
+ CatchSignal( SIGUSR1, SIGNAL_CAST sig_usr1 );
+
return( 0 );
} /* sig_usr1 */
#endif /* SIGUSR1 */
@@ -208,8 +205,7 @@ void reopen_logs( void )
dbf = fopen( debugf, "a" );
else
dbf = fopen( debugf, "w" );
- /*
- * Fix from klausr@ITAP.Physik.Uni-Stuttgart.De
+ /* Fix from klausr@ITAP.Physik.Uni-Stuttgart.De
* to fix problem where smbd's that generate less
* than 100 messages keep growing the log.
*/
@@ -247,7 +243,7 @@ static void check_log_size( void )
int maxlog;
struct stat st;
- if( debug_count++ < 100 || getuid() != 0)
+ if( debug_count++ < 100 || getuid() != 0 )
return;
maxlog = lp_max_log_size() * 1024;