oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

(tn): handle ai_canonname being set in any of the addresses

Browse Source 
returnedby getaddrinfo.  glibc apparently returns the reverse lookup
of every address in ai_canonname.  remove some unused variables.


git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@7760 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Assar Westerlund
2000-01-08 08:04:16 +00:00
parent 0457569ebe
commit 54c51830a0
1 changed files with 13 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
appl/telnet/telnet/commands.c
View File

@@ -1581,7 +1581,7 @@ env_init(void)
/* If this is not the full name, try to get it via DNS */ /* If this is not the full name, try to get it via DNS */
if (strchr(hbuf, '.') == 0) { if (strchr(hbuf, '.') == 0) {
struct addrinfo hints, *ai; struct addrinfo hints, *ai, *a;
int error; int error;
memset (&hints, 0, sizeof(hints)); memset (&hints, 0, sizeof(hints));
@@ -1589,8 +1589,13 @@ env_init(void)
error = getaddrinfo (hbuf, NULL, &hints, &ai); error = getaddrinfo (hbuf, NULL, &hints, &ai);
if (error == 0) { if (error == 0) {
if (ai->ai_canonname != NULL) for (a = ai; a != NULL; a = a->ai_next)
strlcpy (hbuf, ai->ai_canonname, 256); if (a->ai_canonname != NULL) {
strlcpy (hbuf,
ai->ai_canonname,
256);
break;
}
freeaddrinfo (ai); freeaddrinfo (ai);
} }
} }
@@ -2057,14 +2062,7 @@ cmdrc(char *m1, char *m2)
int int
tn(int argc, char **argv) tn(int argc, char **argv)
{ {
#ifdef HAVE_IPV6
struct sockaddr_in6 sin6;
#endif
struct sockaddr_in sin;
struct sockaddr *sa = NULL;
int sa_size = 0;
struct servent *sp = 0; struct servent *sp = 0;
unsigned long temp;
extern char *inet_ntoa(); extern char *inet_ntoa();
#if defined(IP_OPTIONS) && defined(IPPROTO_IP) #if defined(IP_OPTIONS) && defined(IPPROTO_IP)
char *srp = 0; char *srp = 0;
@@ -2072,8 +2070,7 @@ tn(int argc, char **argv)
#endif #endif
char *cmd, *hostp = 0, *portp = 0; char *cmd, *hostp = 0, *portp = 0;
char *user = 0; char *user = 0;
int family, port = 0; int port = 0;
char **addr_list;
/* clear the socket address prior to use */ /* clear the socket address prior to use */
@@ -2176,15 +2173,15 @@ tn(int argc, char **argv)
setuid (getuid ()); setuid (getuid ());
return 0; return 0;
} }
if (ai->ai_canonname != NULL) strlcpy (_hostname, hostp, sizeof(_hostname));
strlcpy (_hostname, ai->ai_canonname, sizeof(_hostname));
else
strlcpy (_hostname, hostp, sizeof(_hostname));
hostname = _hostname; hostname = _hostname;
for (a = ai; a != NULL && connected == 0; a = a->ai_next) { for (a = ai; a != NULL && connected == 0; a = a->ai_next) {
char addrstr[256]; char addrstr[256];
if (a->ai_canonname != NULL)
strlcpy (_hostname, a->ai_canonname, sizeof(_hostname));
if (getnameinfo (a->ai_addr, a->ai_addrlen, if (getnameinfo (a->ai_addr, a->ai_addrlen,
addrstr, sizeof(addrstr), addrstr, sizeof(addrstr),
NULL, 0, NI_NUMERICHOST) != 0) NULL, 0, NI_NUMERICHOST) != 0)