X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=mts%2Fsmtp%2Fhosts.c;h=94287b5cf496da747b2bd408ec92f842b958dceb;hb=a2469f5ecbca3a179251ac9b777b561bc5245d4c;hp=607f4ecca6f43587f982e6c371d5276dda0e4eef;hpb=d2f12554a254e814dcdafb3828fc0d9936154eef;p=mmh

diff --git a/mts/smtp/hosts.c b/mts/smtp/hosts.c
index 607f4ec..94287b5 100644
--- a/mts/smtp/hosts.c
+++ b/mts/smtp/hosts.c
@@ -2,8 +2,6 @@
 /*
  * 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.
@@ -18,6 +16,7 @@
 
 #include <h/mh.h>
 #include <h/mts.h>
+#include <sys/socket.h>
 #include <netdb.h>
 
 static struct host {
@@ -36,8 +35,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;
@@ -51,12 +51,14 @@ OfficialName (char *name)
     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 ()) {
@@ -85,7 +87,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;