sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-28 01:58:17 +03:00
Code

nmbd.c, server.c: Added #ifndef MEM_MAN around code that sets the SIGUSR1

Browse Source 
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)
This commit is contained in:
Jeremy Allison 1998-01-23 05:22:19 +00:00
parent 55f400bd84
commit 66c668a6d3
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source3/nmbd/nmbd.c
View File

@ -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)
{

5
source3/smbd/server.c
View File

@ -5314,6 +5314,10 @@ static void usage(char *pname)
/* 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 */
@ -5321,6 +5325,7 @@ static void usage(char *pname)
#if defined(SIGUSR2)
signal( SIGUSR2, SIGNAL_CAST sig_usr2 );
#endif /* SIGUSR2 */
#endif /* MEM_MAN */
DEBUG(3,("%s loaded services\n",timestring()));