From c64997ab75e843aa33997b44abb01ca77f617c72 Mon Sep 17 00:00:00 2001 From: Hajimu UMEMOTO Date: Thu, 16 Jun 2005 16:35:10 +0000 Subject: simplify NI_WITHSCOPEID patch. Reviewed by: arved --- mail/popd/files/patch-popd.c | 40 ---------------------------------------- 1 file changed, 40 deletions(-) delete mode 100644 mail/popd/files/patch-popd.c (limited to 'mail/popd/files/patch-popd.c') diff --git a/mail/popd/files/patch-popd.c b/mail/popd/files/patch-popd.c deleted file mode 100644 index 83d2fd805e40..000000000000 --- a/mail/popd/files/patch-popd.c +++ /dev/null @@ -1,40 +0,0 @@ ---- 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 - - #include -+#include - #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 -- cgit v1.2.3