albino
/
ngircd-tor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Use Proc_GenericSignalHandler() as handler for SIGTERM by default

This commit is contained in:
Alexander Barton 2010-07-13 22:04:35 +02:00
parent 41034950d9
commit 57a2faf4a7
3 changed files with 3 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/ngircd/irc-login.c
View File

@ -785,7 +785,6 @@ Hello_User(CLIENT * Client)
return CONNECTED; return CONNECTED;
} else { } else {
/* Sub process */ /* Sub process */
signal(SIGTERM, Proc_GenericSignalHandler);
Log_Init_Subprocess("Auth"); Log_Init_Subprocess("Auth");
if (Conf_NoPAM) { if (Conf_NoPAM) {
result = (Client_Password(Client)[0] == '\0'); result = (Client_Password(Client)[0] == '\0');

1
src/ngircd/proc.c
View File

@ -66,6 +66,7 @@ Proc_Fork(PROC_STAT *proc, int *pipefds, void (*cbfunc)(int, short))
return -1; return -1;
case 0: case 0:
/* New child process: */ /* New child process: */
signal(SIGTERM, Proc_GenericSignalHandler);
close(pipefds[0]); close(pipefds[0]);
return 0; return 0;
} }

16
src/ngircd/resolve.c
View File

@ -42,7 +42,6 @@
#include "io.h" #include "io.h"
static void Init_Subprocess PARAMS(( void ));
static void Do_ResolveAddr PARAMS(( const ng_ipaddr_t *Addr, int Sock, int w_fd )); static void Do_ResolveAddr PARAMS(( const ng_ipaddr_t *Addr, int Sock, int w_fd ));
static void Do_ResolveName PARAMS(( const char *Host, int w_fd )); static void Do_ResolveName PARAMS(( const char *Host, int w_fd ));
@ -70,7 +69,7 @@ Resolve_Addr(PROC_STAT * s, const ng_ipaddr_t *Addr, int identsock,
return true; return true;
} else if( pid == 0 ) { } else if( pid == 0 ) {
/* Sub process */ /* Sub process */
Init_Subprocess(); Log_Init_Subprocess("Resolver");
Do_ResolveAddr( Addr, identsock, pipefd[1]); Do_ResolveAddr( Addr, identsock, pipefd[1]);
Log_Exit_Subprocess("Resolver"); Log_Exit_Subprocess("Resolver");
exit(0); exit(0);
@ -99,7 +98,7 @@ Resolve_Name( PROC_STAT *s, const char *Host, void (*cbfunc)(int, short))
return true; return true;
} else if( pid == 0 ) { } else if( pid == 0 ) {
/* Sub process */ /* Sub process */
Init_Subprocess(); Log_Init_Subprocess("Resolver");
Do_ResolveName(Host, pipefd[1]); Do_ResolveName(Host, pipefd[1]);
Log_Exit_Subprocess("Resolver"); Log_Exit_Subprocess("Resolver");
exit(0); exit(0);
@ -108,17 +107,6 @@ Resolve_Name( PROC_STAT *s, const char *Host, void (*cbfunc)(int, short))
} /* Resolve_Name */ } /* Resolve_Name */
/**
* Initialize forked resolver subprocess.
*/
static void
Init_Subprocess(void)
{
signal(SIGTERM, Proc_GenericSignalHandler);
Log_Init_Subprocess("Resolver");
}
#if !defined(HAVE_GETADDRINFO) || !defined(HAVE_GETNAMEINFO) #if !defined(HAVE_GETADDRINFO) || !defined(HAVE_GETNAMEINFO)
#if !defined(WANT_IPV6) && defined(h_errno) #if !defined(WANT_IPV6) && defined(h_errno)
static char * static char *