Moved code from zotnet/mts to mts/generic. Also, unified generic
[mmh] / mts / smtp / hosts.c
index 55f3393..40697ce 100644 (file)
@@ -13,7 +13,7 @@
  */
 
 #include <h/mh.h>
-#include <zotnet/mts/mts.h>
+#include <mts/generic/mts.h>
 #include <netdb.h>
 
 static struct host {
@@ -47,7 +47,7 @@ OfficialName (char *name)
     if (!strcasecmp (LocalName(), site))
        return LocalName();
 
-#ifndef        BIND
+#ifdef HAVE_SETHOSTENT
     sethostent (1);
 #endif
 
@@ -55,14 +55,16 @@ OfficialName (char *name)
        strncpy (buffer, hp->h_name, sizeof(buffer));
        return buffer;
     }
-    if (hosts.h_name || init_hs ())
+    if (hosts.h_name || init_hs ()) {
        for (h = hosts.h_next; h; h = h->h_next)
-           if (!strcasecmp (h->h_name, q))
+           if (!strcasecmp (h->h_name, q)) {
                return h->h_name;
-           else
+           } else {
                for (r = h->h_aliases; *r; r++)
                    if (!strcasecmp (*r, q))
                        return h->h_name;
+           }
+    }
 
     strncpy (buffer, site, sizeof(buffer));
     return buffer;