From 66c668a6d308662dd02ea359551fb6d3867d12ca Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Fri, 23 Jan 1998 05:22:19 +0000 Subject: nmbd.c, server.c: Added #ifndef MEM_MAN around code that sets the SIGUSR1 and SIGUSR2 signals. This allows the MEM_MAN code to be compiled in and the memory debug feature to be used with SIGUSR1. Jeremy. (This used to be commit 43ef7e3cb5bb971ff6ddf8230b08995e55b7c6e1) --- source3/nmbd/nmbd.c | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'source3/nmbd/nmbd.c') diff --git a/source3/nmbd/nmbd.c b/source3/nmbd/nmbd.c index 4497e0b15d..b6e4244cd0 100644 --- a/source3/nmbd/nmbd.c +++ b/source3/nmbd/nmbd.c @@ -580,6 +580,9 @@ int main(int argc,char *argv[]) /* Setup the signals that allow the debug log level to by dynamically changed. */ + /* If we are using the malloc debug code we can't use + SIGUSR1 and SIGUSR2 to do debug level changes. */ +#ifndef MEM_MAN #if defined(SIGUSR1) signal( SIGUSR1, SIGNAL_CAST sig_usr1 ); #endif /* SIGUSR1 */ @@ -587,6 +590,7 @@ int main(int argc,char *argv[]) #if defined(SIGUSR2) signal( SIGUSR2, SIGNAL_CAST sig_usr2 ); #endif /* SIGUSR2 */ +#endif /* MEM_MAN */ while((opt = getopt(argc, argv, "as:T:I:C:bAi:B:N:Rn:l:d:Dp:hSH:G:f:")) != EOF) { -- cgit