FreeBSD does not have header file util.h, fortunately it is not needed. Add header files sys/socket.h and netdb.h for getaddrinfo() and getnameinfo(). If host name is longer than UT_HOSTSIZE (16 characters), log numeric address to utmp. Rewrite utmpx support. --- src/logwtmp.c.orig 2019-01-29 12:14:57 UTC +++ src/logwtmp.c @@ -46,11 +46,13 @@ __RCSID(" NetBSD: logwtmp.c,v 1.27 2015/08/09 20:34:24 #include #include +#include #include #include #include #include +#include #include #include #include @@ -63,7 +65,6 @@ __RCSID(" NetBSD: logwtmp.c,v 1.27 2015/08/09 20:34:24 #ifdef SUPPORT_UTMPX #include #endif -#include #ifdef KERBEROS5 #include @@ -95,6 +96,26 @@ ftpd_logwtmp(const char *line, const char *name, const struct utmp ut; struct stat buf; + if (strlen(host) > UT_HOSTSIZE) { + struct addrinfo hints, *res; + int error; + static char hostbuf[BUFSIZ]; + + memset(&hints, 0, sizeof(hints)); + hints.ai_family = PF_UNSPEC; + error = getaddrinfo(host, NULL, &hints, &res); + if (error) + host = "invalid hostname"; + else { + getnameinfo(res->ai_addr, res->ai_addrlen, + hostbuf, sizeof(hostbuf), NULL, 0, + NI_NUMERICHOST); + host = hostbuf; + if (strlen(host) > UT_HOSTSIZE) + hostbuf[UT_HOSTSIZE] = '\0'; + } + } + if (fd < 0) return; if (fstat(fd, &buf) == 0) { @@ -109,7 +130,7 @@ ftpd_logwtmp(const char *line, const char *name, const } #endif -#ifdef SUPPORT_UTMPX +#if 0 static int fdx = -1; void