Interface change to @conn_init@ -- return error rather than calling the

[mLib] / bres.c

diff --git a/bres.c b/bres.c
index a1d2c544816ff4191a30b34c6474852aabe3392e..2a928e4e250f9d91e9274cf4009a3e02bccf3e29 100644 (file)
--- a/bres.c
+++ b/bres.c
@@ -1,6 +1,6 @@
 /* -*-c-*-
  *
- * $Id: bres.c,v 1.4 2000/08/15 17:35:02 mdw Exp $
+ * $Id: bres.c,v 1.6 2001/06/22 19:33:38 mdw Exp $
  *
  * Background reverse name resolution
  *
@@ -30,6 +30,13 @@
 /*----- Revision history --------------------------------------------------* 
  *
  * $Log: bres.c,v $
+ * Revision 1.6  2001/06/22 19:33:38  mdw
+ * Hack if there is no @_SC_OPEN_MAX@ or @OPEN_MAX@.
+ *
+ * Revision 1.5  2001/02/03 16:21:08  mdw
+ * Bug fixes: restore signals to their default dispositions, and set up the
+ * addresses properly when unpacking @hostent@ structures.
+ *
  * Revision 1.4  2000/08/15 17:35:02  mdw
  * (gethost, and others): Since @gethost@ actually uses @malloc@ rather
  * than @xmalloc@, it's wrong to use @xfree@ on the result.  Fixed the code
@@ -308,9 +315,8 @@ static struct hostent *gethost(int fd)
     if (doread(fd, a, hsk.naddr * hsk.addrsz))
       goto tidy_2;
     for (i = 0; i < hsk.naddr; i++) {
-      struct in_addr in;
       *p++ = a;
-      memcpy(&in, a, sizeof(in));
+      a += hsk.addrsz;
     }
     *p++ = 0;
 
@@ -423,7 +429,13 @@ static void child(int rfd, int cfd)
 
   {
     int i;
+#if defined(_SC_OPEN_MAX)
     int maxfd = sysconf(_SC_OPEN_MAX);
+#elif defined(OPEN_MAX)
+    int maxfd = OPEN_MAX;
+#else
+    int maxfd = -1;
+#endif
 
     if (maxfd < 0)
       maxfd = 256; /* Fingers crossed... */
@@ -433,6 +445,12 @@ static void child(int rfd, int cfd)
     }
   }
 
+  signal(SIGTERM, SIG_DFL);
+  signal(SIGHUP, SIG_DFL);
+  signal(SIGQUIT, SIG_DFL);
+  signal(SIGALRM, SIG_DFL);
+  signal(SIGINT, SIG_DFL);
+
   /* --- Main request/response loop --- */
 
   for (;;) {