X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fngircd%2Fsighandlers.c;h=8f0a5a1b8cd3c8b1fd4a193af8a7c38119d21315;hb=b5b3dd9cfd7e1a10eecc92c8b23bd65945b61a31;hp=80eef3e603d3a382f2e31bf8511ce4433c24c218;hpb=ba720fcbaeaacee700d7d23936cf481e6fcb83b1;p=ngircd-alex.git

diff --git a/src/ngircd/sighandlers.c b/src/ngircd/sighandlers.c
index 80eef3e6..8f0a5a1b 100644
--- a/src/ngircd/sighandlers.c
+++ b/src/ngircd/sighandlers.c
@@ -102,7 +102,7 @@ Rehash(void)
 
 	Log( LOG_NOTICE|LOG_snotice, "Re-reading configuration NOW!" );
 
-	/* Remember old server name and nick name length */
+	/* Remember old server name and nickname length */
 	strlcpy( old_name, Conf_ServerName, sizeof old_name );
 	old_nicklen = Conf_MaxNickLength;
 
@@ -113,7 +113,7 @@ Rehash(void)
 	/* Close down all listening sockets */
 	Conn_ExitListeners( );
 
-	/* Recover old server name and nick name length: these values can't
+	/* Recover old server name and nickname length: these values can't
 	 * be changed during run-time */
 	if (strcmp(old_name, Conf_ServerName) != 0 ) {
 		strlcpy(Conf_ServerName, old_name, sizeof Conf_ServerName);
@@ -218,8 +218,11 @@ Signal_Handler_BH(int Signal)
 		break;
 #ifdef DEBUG
 	case SIGUSR2:
-		if (NGIRCd_Debug)
+		if (NGIRCd_Debug) {
+			Log(LOG_INFO|LOG_snotice,
+			    "Got SIGUSR2, dumping internal state ...");
 			Dump_State();
+		}
 		break;
 	default:
 		Log(LOG_DEBUG, "Got signal %d! Ignored.", Signal);
@@ -236,7 +239,7 @@ Signal_Callback(int fd, short UNUSED what)
 	(void) what;
 
 	do {
-		ret = read(fd, &sig, sizeof(sig));
+		ret = (int)read(fd, &sig, sizeof(sig));
 		if (ret == sizeof(int))
 			Signal_Handler_BH(sig);
 	} while (ret == sizeof(int));
@@ -326,11 +329,12 @@ Signals_Exit(void)
 	sigaction(SIGPIPE, &saction, NULL);
 #else
 	for (i=0; i < C_ARRAY_SIZE(signals_catch) ; i++)
-		sigaction(signals_catch[i], &saction, NULL);
+		signal(signals_catch[i], SIG_DFL);
 	signal(SIGPIPE, SIG_DFL);
 #endif
 	close(signalpipe[1]);
 	close(signalpipe[0]);
+	signalpipe[0] = signalpipe[1] = 0;
 }
 
 /* -eof- */