X-Git-Url: https://git.hcoop.net/hcoop/debian/courier-authlib.git/blobdiff_plain/0fde1ce3109f2259ded7e8bff8d2b1c984252bc0..f77892e671e1261ec26e5133f86b8a52635f3dd2:/authdaemond.c

diff --git a/authdaemond.c b/authdaemond.c
index 0387384..44ad65e 100644
--- a/authdaemond.c
+++ b/authdaemond.c
@@ -18,24 +18,22 @@
 #include	<fcntl.h>
 #include	<ctype.h>
 #include	"numlib/numlib.h"
-#include	"liblock/config.h"
 #include	"liblock/liblock.h"
 #include	"auth.h"
 #include	"authdaemonrc.h"
 #include	"courierauthdebug.h"
 #include	"pkglibdir.h"
-#include	"authstaticlist.h"
+#include	"courierauthstaticlist.h"
 #include        "libhmac/hmac.h"
 #include        "cramlib.h"
 #include	<ltdl.h>
 
-static const char rcsid[]="$Id: authdaemond.c,v 1.34 2008/07/10 02:43:55 mrsam Exp $";
 
 #ifndef	SOMAXCONN
 #define	SOMAXCONN	5
 #endif
 
-#include	"authstaticlist.h"
+#include	"courierauthstaticlist.h"
 
 static unsigned ndaemons;
 
@@ -848,7 +846,7 @@ char	*p;
 
 static int sighup_pipe= -1;
 
-static RETSIGTYPE sighup(int n)
+static void sighup(int n)
 {
 	if (sighup_pipe >= 0)
 	{
@@ -856,14 +854,11 @@ static RETSIGTYPE sighup(int n)
 		sighup_pipe= -1;
 	}
 	signal(SIGHUP, sighup);
-#if	RETSIGTYPE != void
-	return (1);
-#endif
 }
 
 static int sigterm_received=0;
 
-static RETSIGTYPE sigterm(int n)
+static void sigterm(int n)
 {
 	sigterm_received=1;
 	if (sighup_pipe >= 0)
@@ -876,10 +871,6 @@ static RETSIGTYPE sigterm(int n)
 		kill(0, SIGTERM);
 		_exit(0);
 	}
-
-#if	RETSIGTYPE != void
-	return (0);
-#endif
 }
 
 static int startchildren(int *pipefd)