From: Jeremie Koenig <jk@jk.fr.eu.org>
Date: Thu, 27 May 2010 13:39:24 +0000 (+0200)
Subject: libbb: conditionalize AF_* usage in error reporting
X-Git-Tag: 1_18_0~400
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=29885114a5e3d22ee7aa3ab0e373e00e7cff443c;p=oweals%2Fbusybox.git

libbb: conditionalize AF_* usage in error reporting

Signed-off-by: Jeremie Koenig <jk@jk.fr.eu.org>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
---

diff --git a/libbb/xfuncs_printf.c b/libbb/xfuncs_printf.c
index 7069a7c8e..91f7ba22c 100644
--- a/libbb/xfuncs_printf.c
+++ b/libbb/xfuncs_printf.c
@@ -387,8 +387,12 @@ int FAST_FUNC xsocket(int domain, int type, int protocol)
 		/* Hijack vaguely related config option */
 #if ENABLE_VERBOSE_RESOLUTION_ERRORS
 		const char *s = "INET";
+# ifdef AF_PACKET
 		if (domain == AF_PACKET) s = "PACKET";
+# endif
+# ifdef AF_NETLINK
 		if (domain == AF_NETLINK) s = "NETLINK";
+# endif
 IF_FEATURE_IPV6(if (domain == AF_INET6) s = "INET6";)
 		bb_perror_msg_and_die("socket(AF_%s,%d,%d)", s, type, protocol);
 #else
diff --git a/networking/Config.src b/networking/Config.src
index 26c59e7c1..fc613e8d3 100644
--- a/networking/Config.src
+++ b/networking/Config.src
@@ -43,7 +43,6 @@ config FEATURE_PREFER_IPV4_ADDRESS
 config VERBOSE_RESOLUTION_ERRORS
 	bool "Verbose resolution errors"
 	default n
-	depends on PLATFORM_LINUX #because of xsocket() in libbb/xfuncs_prinf.c
 	help
 	  Enable if you are not satisfied with simplistic
 	  "can't resolve 'hostname.com'" and want to know more.