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

Added IPv6 name resolving support for utmp logging.

Browse Source 
Approved by: jkh
This commit is contained in:
Yoshinobu Inoue 2000-02-19 15:57:52 +00:00
parent 956ef11d64
commit 6d939e82e0
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=57339
1 changed files with 40 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
usr.bin/login/login.c
View File

@ -54,6 +54,7 @@ static const char rcsid[] =
#include <sys/copyright.h>
#include <sys/param.h>
#include <sys/stat.h>
#include <sys/socket.h>
#include <sys/time.h>
#include <sys/resource.h>
#include <sys/file.h>
@ -84,6 +85,11 @@ static const char rcsid[] =
#include "pathnames.h"
/* wrapper for KAME-special getnameinfo() */
#ifndef NI_WITHSCOPEID
#define NI_WITHSCOPEID 0
#endif
void badlogin __P((char *));
void checknologin __P((void));
void dolastlog __P((int));
@ -187,15 +193,27 @@ main(argc, argv)
trimdomain(optarg, UT_HOSTSIZE);
if (strlen(optarg) > UT_HOSTSIZE) {
struct hostent *hp = gethostbyname(optarg);
struct addrinfo hints, *res;
int ga_err;
memset(&hints, 0, sizeof(hints));
hints.ai_family = AF_UNSPEC;
ga_err = getaddrinfo(optarg, NULL, &hints,
&res);
if (ga_err == 0) {
char hostbuf[MAXHOSTNAMELEN];
if (hp != NULL) {
struct in_addr in;
memmove(&in, hp->h_addr, sizeof(in));
optarg = strdup(inet_ntoa(in));
getnameinfo(res->ai_addr,
res->ai_addrlen,
hostbuf,
sizeof(hostbuf), NULL, 0,
NI_NUMERICHOST|
NI_WITHSCOPEID);
optarg = strdup(hostbuf);
} else
optarg = "invalid hostname";
if (res != NULL)
freeaddrinfo(res);
}
hostname = optarg;
break;
@ -408,15 +426,24 @@ main(argc, argv)
if (lc != NULL) {
if (hostname) {
struct hostent *hp = gethostbyname(full_hostname);
struct addrinfo hints, *res;
int ga_err;
if (hp == NULL)
memset(&hints, 0, sizeof(hints));
hints.ai_family = AF_UNSPEC;
ga_err = getaddrinfo(full_hostname, NULL, &hints,
&res);
if (ga_err == 0) {
char hostbuf[MAXHOSTNAMELEN];
getnameinfo(res->ai_addr, res->ai_addrlen,
hostbuf, sizeof(hostbuf), NULL, 0,
NI_NUMERICHOST|NI_WITHSCOPEID);
optarg = strdup(hostbuf);
} else
optarg = NULL;
else {
struct in_addr in;
memmove(&in, hp->h_addr, sizeof(in));
optarg = strdup(inet_ntoa(in));
}
if (res != NULL)
freeaddrinfo(res);
if (!auth_hostok(lc, full_hostname, optarg))
refused("Permission denied", "HOST", 1);
}