Various Debian fixes.

[mLib] / bres.c

diff --git a/bres.c b/bres.c
index 497115317bbf47f664abd37b8c0a85e56222b682..2a928e4e250f9d91e9274cf4009a3e02bccf3e29 100644 (file)
--- a/bres.c
+++ b/bres.c
@@ -1,6 +1,6 @@
 /* -*-c-*-
  *
- * $Id: bres.c,v 1.3 2000/06/17 10:38:35 mdw Exp $
+ * $Id: bres.c,v 1.6 2001/06/22 19:33:38 mdw Exp $
  *
  * Background reverse name resolution
  *
@@ -30,6 +30,18 @@
 /*----- 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
+ * to use the right freeing function on the right data.
+ *
  * Revision 1.3  2000/06/17 10:38:35  mdw
  * Track changes to selbuf interface.
  *
@@ -303,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;
 
@@ -319,15 +330,15 @@ static struct hostent *gethost(int fd)
 
     h->h_name = a;
     PUT(name);
-    xfree(name);
+    free(name);
     h->h_aliases = p;
     for (i = 0; i < hsk.nalias; i++) {
       *p++ = a;
       PUT(alias[i]);
-      xfree(alias[i]);
+      free(alias[i]);
     }
     *p++ = 0;
-    xfree(alias);
+    free(alias);
  
 #undef PUT
   }
@@ -340,11 +351,11 @@ tidy_2:
   {
     int i;
     for (i = 0; i < hsk.nalias && alias[i]; i++)
-      xfree(alias[i]);
-    xfree(alias);
+      free(alias[i]);
+    free(alias);
   }
 tidy_1:
-  xfree(name);
+  free(name);
 tidy_0:
   return (0);
 }
@@ -418,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... */
@@ -428,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 (;;) {
@@ -453,7 +476,7 @@ static void child(int rfd, int cfd)
        free(name);
       }        break;
 
-      /* --- Forward lookup --- */
+      /* --- Reverse lookup --- */
 
       case BRES_BYADDR: {
        struct in_addr addr;
@@ -669,7 +692,7 @@ static void answer(int fd, unsigned mode, void *vp)
       xfree(rc->u.name);
   }
   if (h)
-    xfree(h);
+    free(h);
   if (fail)
     zap(rs);
   if (!rc)