Merge branch 'debian'

[hcoop/debian/courier-authlib.git] / authdaemond.c

diff --git a/authdaemond.c b/authdaemond.c
index df902b8..44ad65e 100644 (file)
--- a/authdaemond.c
+++ b/authdaemond.c
@@ -1,5 +1,5 @@
 /*
-** Copyright 2000-2006 Double Precision, Inc.  See COPYING for
+** Copyright 2000-2008 Double Precision, Inc.  See COPYING for
 ** distribution information.
 */
 
@@ -18,27 +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.33 2006/06/01 10:47:32 mrsam Exp $";
 
 #ifndef        SOMAXCONN
 #define        SOMAXCONN       5
 #endif
 
-#if HAVE_HMACLIB
-#include        "libhmac/hmac.h"
-#include        "cramlib.h"
-#endif
-
-#include       "authstaticlist.h"
+#include       "courierauthstaticlist.h"
 
 static unsigned ndaemons;
 
@@ -851,7 +846,7 @@ char        *p;
 
 static int sighup_pipe= -1;
 
-static RETSIGTYPE sighup(int n)
+static void sighup(int n)
 {
        if (sighup_pipe >= 0)
        {
@@ -859,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)
@@ -879,10 +871,6 @@ static RETSIGTYPE sigterm(int n)
                kill(0, SIGTERM);
                _exit(0);
        }
-
-#if    RETSIGTYPE != void
-       return (0);
-#endif
 }
 
 static int startchildren(int *pipefd)