|
 |
ce2f68 |
--- netkit-telnet-0.17.orig/telnetd/telnetd.c 2007-03-13 16:31:20.000000000 +0000
|
|
|
ce2f68 |
+++ netkit-telnet-0.17.orig/telnetd/telnetd.c 2007-03-13 16:31:26.000000000 +0000
|
|
|
ce2f68 |
@@ -653,6 +653,11 @@ doit(struct sockaddr *who, socklen_t who
|
|
|
ce2f68 |
|
|
|
ce2f68 |
error = getnameinfo(who, wholen, namebuf, sizeof(namebuf), NULL, 0, 0);
|
|
|
ce2f68 |
|
|
|
ce2f68 |
+ /* if we can't get a hostname now, settle for an address */
|
|
|
ce2f68 |
+ if(error == EAI_AGAIN)
|
|
|
ce2f68 |
+ error = getnameinfo(who, wholen, namebuf, sizeof(namebuf),
|
|
|
ce2f68 |
+ NULL, 0, NI_NUMERICHOST);
|
|
|
ce2f68 |
+
|
|
|
ce2f68 |
if (error) {
|
|
|
ce2f68 |
perror("getnameinfo: localhost");
|
|
|
ce2f68 |
perror(gai_strerror(error));
|
|
|
ce2f68 |
@@ -681,7 +686,7 @@ doit(struct sockaddr *who, socklen_t who
|
|
|
ce2f68 |
/* Get local host name */
|
|
|
ce2f68 |
{
|
|
|
ce2f68 |
struct addrinfo hints;
|
|
|
ce2f68 |
- struct addrinfo *res;
|
|
|
ce2f68 |
+ struct addrinfo *res = 0;
|
|
|
ce2f68 |
int e;
|
|
|
ce2f68 |
|
|
|
ce2f68 |
memset(&hints, '\0', sizeof(hints));
|
|
|
ce2f68 |
@@ -690,11 +695,14 @@ doit(struct sockaddr *who, socklen_t who
|
|
|
ce2f68 |
|
|
|
ce2f68 |
gethostname(host_name, sizeof(host_name));
|
|
|
ce2f68 |
if ((e = getaddrinfo(host_name, NULL, &hints, &res)) != 0) {
|
|
|
ce2f68 |
- perror("getaddrinfo: localhost");
|
|
|
ce2f68 |
- perror(gai_strerror(e));
|
|
|
ce2f68 |
- exit(1);
|
|
|
ce2f68 |
+ if(e != EAI_AGAIN) {
|
|
|
ce2f68 |
+ fprintf(stderr, "getaddrinfo: localhost %s\n",
|
|
|
ce2f68 |
+ gai_strerror(e));
|
|
|
ce2f68 |
+ exit(1);
|
|
|
ce2f68 |
+ }
|
|
|
ce2f68 |
}
|
|
|
ce2f68 |
- freeaddrinfo(res);
|
|
|
ce2f68 |
+ if(res)
|
|
|
ce2f68 |
+ freeaddrinfo(res);
|
|
|
ce2f68 |
}
|
|
|
ce2f68 |
|
|
|
ce2f68 |
#if defined(AUTHENTICATE) || defined(ENCRYPT)
|
|
|
ce2f68 |
|