cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix build after NI_WITHSCOPEID removal

Browse Source 
Reported by:	pointyhat
This commit is contained in:
Tilman Keskinoz 2005-06-15 13:56:51 +00:00
parent 8f802f2957
commit f5b4c26296
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=137492
1 changed files with 40 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
mail/popd/files/patch-popd.c Normal file
View File

@ -0,0 +1,40 @@
--- src/popd.c.orig Wed Jun 15 15:28:13 2005
+++ src/popd.c Wed Jun 15 15:49:05 2005
@@ -46,6 +46,7 @@
#include <unistd.h>
#include <poputil.h>
+#include <osreldate.h>
#include "config.h"
#include "popd.h"
#include "paths.h"
@@ -280,9 +281,15 @@
}
#endif
if (bind(serverfd, r->ai_addr, r->ai_addrlen) < 0) {
+#if __FreeBSD_version >= 502000
+ getnameinfo(r->ai_addr, r->ai_addrlen,
+ ip, sizeof(ip), NULL, 0,
+ NI_NUMERICHOST);
+#else
getnameinfo(r->ai_addr, r->ai_addrlen,
ip, sizeof(ip), NULL, 0,
NI_NUMERICHOST | NI_WITHSCOPEID);
+#endif
syslog(facility, "Can't bind port %s on %s",
config.port, ip);
close(serverfd);
@@ -434,8 +441,13 @@
facility = LOG_INFO;
if (config.daemonise || config.debug)
#ifdef USE_IPV6
+#if __FreeBSD_version >= 502000
+ getnameinfo((struct sockaddr *)&addr, addr.ss_len,
+ ip, sizeof(ip), NULL, 0, NI_NUMERICHOST);
+#else
getnameinfo((struct sockaddr *)&addr, addr.ss_len,
ip, sizeof(ip), NULL, 0, NI_NUMERICHOST | NI_WITHSCOPEID);
+#endif
if (config.daemonise || config.debug)
syslog(facility, "Connection from %s", ip);
#else