X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=sbr%2Faddrsbr.c;h=e75908877882a8f353a5cad5b56bf5909f92a333;hb=e1b2a81e2b5f77605973a47734a895cd3e83b73c;hp=2327e47ad064a6034fa45eb330f9992587abedf5;hpb=83e04675b53374a1436029a367283d6d4ee05a07;p=mmh

diff --git a/sbr/addrsbr.c b/sbr/addrsbr.c
index 2327e47..e759088 100644
--- a/sbr/addrsbr.c
+++ b/sbr/addrsbr.c
@@ -40,9 +40,6 @@ static char *note = NULL;
 static char err[BUFSIZ];
 static char adr[BUFSIZ];
 
-/* static prototype */
-char *OfficialName(char *);
-
 
 char *
 getname(char *addrs)
@@ -244,7 +241,7 @@ ismymbox(struct mailname *np)
 	char buffer[BUFSIZ];
 	struct mailname *mp;
 	static char *am = NULL;
-	static struct mailname mq={NULL};
+	static struct mailname mq;
 
 	/*
 	** If this is the first call, initialize
@@ -375,50 +372,3 @@ local_test: ;
 
 	return 0;
 }
-
-
-/*
-** Moved from hosts.c -- find out the official name of a host
-*/
-
-/*
-** In the SendMail world, we really don't know what the valid
-** hosts are.  We could poke around in the sendmail.cf file, but
-** that still isn't a guarantee.  As a result, we'll say that
-** everything is a valid host, and let SendMail worry about it.
-*/
-
-#include <netdb.h>
-
-
-char *
-OfficialName(char *name)
-{
-	unsigned char *p;
-	char *q, site[BUFSIZ];
-	struct addrinfo hints, *res;
-
-	static char buffer[BUFSIZ];
-
-	for (p = name, q = site; *p && (q - site < sizeof(site) - 1); p++, q++)
-		*q = isupper(*p) ? tolower(*p) : *p;
-	*q = '\0';
-	q = site;
-
-	if (!mh_strcasecmp(LocalName(), site))
-		return LocalName();
-
-	memset(&hints, 0, sizeof(hints));
-	hints.ai_flags = AI_CANONNAME;
-	hints.ai_family = PF_UNSPEC;
-
-	if (getaddrinfo(q, NULL, &hints, &res) == 0) {
-		strncpy(buffer, res->ai_canonname, sizeof(buffer));
-		buffer[sizeof(buffer) - 1] = '\0';
-		freeaddrinfo(res);
-		return buffer;
-	}
-
-	strncpy(buffer, site, sizeof(buffer));
-	return buffer;
-}