X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=mts%2Fsmtp%2Fhosts.c;h=908e6194d469989546ddb7394cf3644c42974e64;hb=676aafb5cca9531170843b28fe4e3ba12c322c50;hp=40697ce90b4501c7810bc870fe8a576a9167e92d;hpb=75e073ea52a427394690e0c1ef7943a1727c7095;p=mmh

diff --git a/mts/smtp/hosts.c b/mts/smtp/hosts.c
index 40697ce..908e619 100644
--- a/mts/smtp/hosts.c
+++ b/mts/smtp/hosts.c
@@ -3,6 +3,10 @@
  * hosts.c -- find out the official name of a host
  *
  * $Id$
+ *
+ * This code is Copyright (c) 2002, by the authors of nmh.  See the
+ * COPYRIGHT file in the root directory of the nmh distribution for
+ * complete copyright information.
  */
 
 /*
@@ -13,7 +17,7 @@
  */
 
 #include <h/mh.h>
-#include <mts/generic/mts.h>
+#include <h/mts.h>
 #include <netdb.h>
 
 static struct host {
@@ -32,8 +36,9 @@ static int init_hs(void);
 char *
 OfficialName (char *name)
 {
-    char *p, *q, site[BUFSIZ];
-    struct hostent *hp;
+    unsigned char *p;
+    char *q, site[BUFSIZ];
+    struct addrinfo hints, *res;
 
     static char buffer[BUFSIZ];
     char **r;
@@ -44,24 +49,26 @@ OfficialName (char *name)
     *q = '\0';
     q = site;
 
-    if (!strcasecmp (LocalName(), site))
+    if (!mh_strcasecmp (LocalName(), site))
 	return LocalName();
 
-#ifdef	HAVE_SETHOSTENT
-    sethostent (1);
-#endif
+    memset(&hints, 0, sizeof(hints));
+    hints.ai_flags = AI_CANONNAME;
+    hints.ai_family = PF_UNSPEC;
 
-    if ((hp = gethostbyname (q))) {
-	strncpy (buffer, hp->h_name, sizeof(buffer));
+    if (getaddrinfo(q, NULL, &hints, &res) == 0) {
+	strncpy (buffer, res->ai_canonname, sizeof(buffer));
+	buffer[sizeof(buffer) - 1] = '\0';
+	freeaddrinfo(res);
 	return buffer;
     }
     if (hosts.h_name || init_hs ()) {
 	for (h = hosts.h_next; h; h = h->h_next)
-	    if (!strcasecmp (h->h_name, q)) {
+	    if (!mh_strcasecmp (h->h_name, q)) {
 		return h->h_name;
 	    } else {
 		for (r = h->h_aliases; *r; r++)
-		    if (!strcasecmp (*r, q))
+		    if (!mh_strcasecmp (*r, q))
 			return h->h_name;
 	    }
     }
@@ -81,7 +88,8 @@ OfficialName (char *name)
 static int
 init_hs (void)
 {
-    char  *cp, *dp, **q, **r;
+    unsigned char  *cp;
+    char *dp, **q, **r;
     char buffer[BUFSIZ], *aliases[NALIASES];
     register struct host *h;
     register FILE  *fp;