projects
/
mmh
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Escape spaces in DEFAULTS sections of man pages so they no longer are lost.
[mmh]
/
mts
/
smtp
/
hosts.c
diff --git
a/mts/smtp/hosts.c
b/mts/smtp/hosts.c
index
33eb9e6
..
94a22d5
100644
(file)
--- a/
mts/smtp/hosts.c
+++ b/
mts/smtp/hosts.c
@@
-2,8
+2,6
@@
/*
* hosts.c -- find out the official name of a host
*
/*
* 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.
* 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 <h/mh.h>
#include <h/mts.h>
+#include <sys/socket.h>
#include <netdb.h>
static struct host {
#include <netdb.h>
static struct host {
@@
-38,26
+37,28
@@
OfficialName (char *name)
{
unsigned char *p;
char *q, site[BUFSIZ];
{
unsigned char *p;
char *q, site[BUFSIZ];
- struct hostent *hp;
+ struct addrinfo hints, *res;
static char buffer[BUFSIZ];
char **r;
struct host *h;
static char buffer[BUFSIZ];
char **r;
struct host *h;
- for (p = name, q = site; *p && (q - site < sizeof(site) - 1); p++, q++)
+ for (p = name, q = site; *p && (q - site < (int)sizeof(site) - 1); p++, q++)
*q = isupper (*p) ? tolower (*p) : *p;
*q = '\0';
q = site;
*q = isupper (*p) ? tolower (*p) : *p;
*q = '\0';
q = site;
- if (!mh_strcasecmp (LocalName(), site))
- return LocalName();
+ if (!mh_strcasecmp (LocalName(1), site))
+ return LocalName(1);
-#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 ()) {
return buffer;
}
if (hosts.h_name || init_hs ()) {