diff options
| author | Michael Hanson <hansonorders@verizon.net> | 2010-12-08 21:05:20 (GMT) |
|---|---|---|
| committer | Michael Hanson <hansonorders@verizon.net> | 2010-12-08 21:05:20 (GMT) |
| commit | e0ac4fd3706f8521fe343229d94dd9725ca18280 (patch) | |
| tree | 56eb6d580a64650bc77283e32341a7517facb29d /abs/core/dhcp/dhcp-4.1.1-missing-ipv6-not-fatal.patch | |
| parent | 8084aca8649eb7e20f638bfe2ba683647cea3141 (diff) | |
| download | linhes_pkgbuild-e0ac4fd3706f8521fe343229d94dd9725ca18280.zip linhes_pkgbuild-e0ac4fd3706f8521fe343229d94dd9725ca18280.tar.gz linhes_pkgbuild-e0ac4fd3706f8521fe343229d94dd9725ca18280.tar.bz2 | |
dhcp: upgrade
Diffstat (limited to 'abs/core/dhcp/dhcp-4.1.1-missing-ipv6-not-fatal.patch')
| -rw-r--r-- | abs/core/dhcp/dhcp-4.1.1-missing-ipv6-not-fatal.patch | 39 |
1 files changed, 39 insertions, 0 deletions
diff --git a/abs/core/dhcp/dhcp-4.1.1-missing-ipv6-not-fatal.patch b/abs/core/dhcp/dhcp-4.1.1-missing-ipv6-not-fatal.patch new file mode 100644 index 0000000..cc5ddb8 --- /dev/null +++ b/abs/core/dhcp/dhcp-4.1.1-missing-ipv6-not-fatal.patch @@ -0,0 +1,39 @@ +--- common/discover.c 2009-09-29 21:44:49.000000000 +0200 ++++ common/discover.c_new 2010-06-30 19:40:02.000000000 +0200 +@@ -443,7 +443,7 @@ + } + + #ifdef DHCPv6 +- if (local_family == AF_INET6) { ++ if ((local_family == AF_INET6) && !access("/proc/net/if_inet6", R_OK)) { + ifaces->fp6 = fopen("/proc/net/if_inet6", "r"); + if (ifaces->fp6 == NULL) { + log_error("Error opening '/proc/net/if_inet6' to " +@@ -454,6 +454,8 @@ + ifaces->fp = NULL; + return 0; + } ++ } else { ++ ifaces->fp6 = NULL; + } + #endif + +@@ -721,7 +723,7 @@ + return 1; + } + #ifdef DHCPv6 +- if (!(*err)) { ++ if (!(*err) && ifaces->fp6) { + if (local_family == AF_INET6) + return next_iface6(info, err, ifaces); + } +@@ -740,7 +742,8 @@ + ifaces->sock = -1; + #ifdef DHCPv6 + if (local_family == AF_INET6) { +- fclose(ifaces->fp6); ++ if(ifaces->fp6) ++ fclose(ifaces->fp6); + ifaces->fp6 = NULL; + } + #endif |