ports/ftp/tnftpd/files/patch-src-logwtmp.c
Beech Rintoul 6d5be51723 - Update to 20080609
PR:		ports/126749
Submitted by:	Yarema <yds@CoolRat.org>
Approved by:	Rudolf Cejka <cejkar@fit.vutbr.cz> (maintainer)
2008-08-23 20:13:18 +00:00

57 lines
1.3 KiB
C

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.
--- src/logwtmp.c.orig 2008-05-31 23:26:12.000000000 -0400
+++ src/logwtmp.c 2008-05-31 23:26:12.000000000 -0400
@@ -43,11 +43,13 @@
#include <sys/types.h>
#include <sys/param.h>
+#include <sys/socket.h>
#include <sys/time.h>
#include <sys/stat.h>
#include <sys/wait.h>
#include <fcntl.h>
+#include <netdb.h>
#include <signal.h>
#include <stdio.h>
#include <string.h>
@@ -60,7 +62,6 @@
#ifdef SUPPORT_UTMPX
#include <utmpx.h>
#endif
-#include <util.h>
#ifdef KERBEROS5
#include <krb5/krb5.h>
@@ -90,6 +91,26 @@
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) {