d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Sshd writes connected host into utmp directly. If the connection is

Browse Source 
via IPv6, the hostname is trimed due to the length of IPv6 address.
This change saves it as possible.
I have a grudge against the shortage of UT_HOSTSIZE.
This commit is contained in:
ume 2000-07-14 18:08:19 +00:00
parent 0fc3455bb5
commit 3f52ad52cc
1 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
lib/libutil/realhostname.c
View File

@ -131,13 +131,20 @@ realhostname_sa(char *host, size_t hsize, struct sockaddr *addr, int addrlen)
freeaddrinfo(ores);
goto numeric;
}
if (strlen(ores->ai_canonname) > hsize &&
addr->sa_family == AF_INET) {
freeaddrinfo(ores);
goto numeric;
}
strncpy(host, ores->ai_canonname,
hsize);
if (strlen(ores->ai_canonname) > hsize) {
if (addr->sa_family == AF_INET) {
freeaddrinfo(ores);
goto numeric;
}
strncpy(buf,
ores->ai_canonname,
sizeof(buf));
trimdomain(buf, hsize);
strncpy(host, buf, hsize);
} else
strncpy(host,
ores->ai_canonname,
hsize);
break;
}
((struct sockinet *)addr)->si_port = port;