Sorry - reinstate <sys/signal.h> for srv_net and proto_serv

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@5642 dc483132-0cff-0310-8789-dd5450dbe970

diff --git a/src/kadmin/v5server/ChangeLog b/src/kadmin/v5server/ChangeLog
index d3dee80b2e03105214b3d36b3f64e239769ae9a2..ec0ee8829c9d8e880996359ba96e7c1bb1012673 100644 (file)
--- a/src/kadmin/v5server/ChangeLog
+++ b/src/kadmin/v5server/ChangeLog
@@ -1,6 +1,9 @@
-Fri Apr 28 17:38:40 1995  Mark Eichin  <eichin@cygnus.com>
 
-       * srv_net.c: include <signal.h>.
+Fri Apr 28 17:38:36 EDT 1995   Paul Park       (pjpark@mit.edu)
+
+       * srv_net.c, proto_serv.c - re-include <signal.h> for signal name
+               definitions.  Removal of them was over-zealous.
+
 
 Fri Apr 28 16:38:18 EDT 1995   Paul Park       (pjpark@mit.edu)
        * srv_output.c  - slight cleanup to allow output_lang_supported()

diff --git a/src/kadmin/v5server/proto_serv.c b/src/kadmin/v5server/proto_serv.c
index f3dcc490b73f3d1cd70c42f6862051d94d908ef3..2b4cc600ce1b9cf95c2853baf158adba64826cda 100644 (file)
--- a/src/kadmin/v5server/proto_serv.c
+++ b/src/kadmin/v5server/proto_serv.c
@@ -27,6 +27,7 @@
  *     protocol as implemented in lib/krb5/os/adm_conn.c.  Any changes
  *     in one module must be reflected in the other.
  */
+#include <sys/signal.h>
 #define        NEED_SOCKETS
 #include "k5-int.h"
 #include "com_err.h"

diff --git a/src/kadmin/v5server/srv_net.c b/src/kadmin/v5server/srv_net.c
index 23ee900a1a54fc27e208fece9d65ad67100cb21f..c3f67880149ac7a8e3ab0d961cfdef8b70674ffa 100644 (file)
--- a/src/kadmin/v5server/srv_net.c
+++ b/src/kadmin/v5server/srv_net.c
@@ -28,7 +28,7 @@
 #include <errno.h>
 #include <setjmp.h>
 #include <sys/wait.h>
-#include <signal.h>
+#include <sys/signal.h>
 #ifdef USE_PTHREADS
 #include <pthread.h>
 #endif /* USE_PTHREADS */
@@ -491,7 +491,7 @@ net_init(kcontext, debug_level)
     bind_tries = 0;
     do {
        if (bind(net_listen_socket,
-                &net_server_addr,
+                (struct sockaddr *) &net_server_addr,
                 sizeof(net_server_addr)) < 0) {
            kret = errno;
            if (errno != EADDRINUSE) {