diff options
| author | Michael Hanson <hansonorders@verizon.net> | 2010-12-10 00:19:00 (GMT) |
|---|---|---|
| committer | Michael Hanson <hansonorders@verizon.net> | 2010-12-10 00:19:00 (GMT) |
| commit | 5ab2c2d585290fb77dfc8d3670361df2fdc11c62 (patch) | |
| tree | 58fc24f3a355bff701d6e93ba8011e9d1764f7b9 /abs/core/dhcp | |
| parent | 4592612b015ff899ef52f33d96b52b5c60587ebb (diff) | |
| download | linhes_pkgbuild-5ab2c2d585290fb77dfc8d3670361df2fdc11c62.zip linhes_pkgbuild-5ab2c2d585290fb77dfc8d3670361df2fdc11c62.tar.gz linhes_pkgbuild-5ab2c2d585290fb77dfc8d3670361df2fdc11c62.tar.bz2 | |
A whole lotta housekeeping
Diffstat (limited to 'abs/core/dhcp')
| -rw-r--r-- | abs/core/dhcp/dhcp-4.1.0-missing-ipv6-not-fatal.patch | 50 |
1 files changed, 0 insertions, 50 deletions
diff --git a/abs/core/dhcp/dhcp-4.1.0-missing-ipv6-not-fatal.patch b/abs/core/dhcp/dhcp-4.1.0-missing-ipv6-not-fatal.patch deleted file mode 100644 index ebf3865..0000000 --- a/abs/core/dhcp/dhcp-4.1.0-missing-ipv6-not-fatal.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 - } |