diff options
| author | Timo Teräs <timo.teras@iki.fi> | 2013-10-28 13:41:31 +0000 |
|---|---|---|
| committer | Timo Teräs <timo.teras@iki.fi> | 2013-10-28 13:41:31 +0000 |
| commit | 9edb877588f01566225a289e63dc0f5667ae730b (patch) | |
| tree | 5bbb779a767accc5d360dc33d4d721d8345634b1 /main/dhcp/linux_ipv6_discover.patch | |
| parent | fa1b35ab32465c99b24151c0c931eea4fb6b5d13 (diff) | |
| download | aports-9edb877588f01566225a289e63dc0f5667ae730b.tar.bz2 aports-9edb877588f01566225a289e63dc0f5667ae730b.tar.xz | |
main/dhcp: fix musl build
Diffstat (limited to 'main/dhcp/linux_ipv6_discover.patch')
| -rw-r--r-- | main/dhcp/linux_ipv6_discover.patch | 50 |
1 files changed, 0 insertions, 50 deletions
diff --git a/main/dhcp/linux_ipv6_discover.patch b/main/dhcp/linux_ipv6_discover.patch deleted file mode 100644 index ebf3865e6a..0000000000 --- a/main/dhcp/linux_ipv6_discover.patch +++ /dev/null @@ -1,50 +0,0 @@ -diff -Naur dhcp-4.1.0a2/common/discover.c dhcp-4.1.0a2-mcn/common/discover.c ---- dhcp-4.1.0a2/common/discover.c 2008-08-29 18:48:57.000000000 +0100 -+++ dhcp-4.1.0a2-mcn/common/discover.c 2008-10-02 13:02:06.000000000 +0100 -@@ -443,15 +443,17 @@ - } - - #ifdef DHCPv6 -- ifaces->fp6 = fopen("/proc/net/if_inet6", "r"); -- if (ifaces->fp6 == NULL) { -- log_error("Error opening '/proc/net/if_inet6' to " -- "list IPv6 interfaces; %m"); -- close(ifaces->sock); -- ifaces->sock = -1; -- fclose(ifaces->fp); -- ifaces->fp = NULL; -- return 0; -+ if (local_family == AF_INET6) { -+ ifaces->fp6 = fopen("/proc/net/if_inet6", "r"); -+ if (ifaces->fp6 == NULL) { -+ log_error("Error opening '/proc/net/if_inet6' to " -+ "list IPv6 interfaces; %m"); -+ close(ifaces->sock); -+ ifaces->sock = -1; -+ fclose(ifaces->fp); -+ ifaces->fp = NULL; -+ return 0; -+ } - } - #endif - -@@ -720,7 +722,8 @@ - } - #ifdef DHCPv6 - if (!(*err)) { -- return next_iface6(info, err, ifaces); -+ if (local_family == AF_INET6) -+ return next_iface6(info, err, ifaces); - } - #endif - return 0; -@@ -736,7 +739,8 @@ - close(ifaces->sock); - ifaces->sock = -1; - #ifdef DHCPv6 -- fclose(ifaces->fp6); -+ if (local_family == AF_INET6) -+ fclose(ifaces->fp6); - ifaces->fp6 = NULL; - #endif - } |