From 77fdbe116be59ff111119ab23b62db90bcfa534e Mon Sep 17 00:00:00 2001
From: Mats Erik Andersson <address@hidden>
Date: Wed, 3 Nov 2010 09:34:17 +0100
Subject: [PATCH 2/2] src/inetd.c: Further conditions on AI_V4MAPPED.

---
 ChangeLog   |    5 +++++
 src/inetd.c |    2 +-
 2 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 74ece86..e73b81c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2010-11-03  Mats Erik Andersson <address@hidden>
 
+	* src/inetd.c (inetd_getaddrinfo): Do not use AI_V4MAPPED with
+	address family AF_INET.  FreeBSD fails otherwise.
+
+2010-11-03  Mats Erik Andersson <address@hidden>
+
 	* ifconfig/flags.c (flag_char_tab): Protect the uses of
 	IFF_NOTRAILERS by `#ifdef'.
 
diff --git a/src/inetd.c b/src/inetd.c
index f5f7d32..ce7592e 100644
--- a/src/inetd.c
+++ b/src/inetd.c
@@ -743,7 +743,7 @@ inetd_getaddrinfo (struct servtab *sep, int proto, struct addrinfo **result)
 
   hints.ai_flags = AI_PASSIVE;
 #ifdef AI_V4MAPPED
-  if (sep->se_v4mapped)
+  if (sep->se_v4mapped && (sep->se_family != AF_INET))
     hints.ai_flags |= AI_V4MAPPED;
 #endif
   hints.ai_family = sep->se_family;
-- 
1.7.1