summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars Wendler <polynomial-c@gentoo.org>2019-08-01 00:00:35 +0200
committerLars Wendler <polynomial-c@gentoo.org>2019-08-01 00:03:51 +0200
commitbe2f1e5f86171478cf4a9e24b2a414716cfa71fd (patch)
tree8b0bfbaff7d3ff15935c512553c0f372d57e295b /net-misc/dhcp/files/dhcp-4.2.4-always-accept-4.patch
parentdev-util/cmake: stable 3.14.6 for sparc, bug #691114 (diff)
downloadgentoo-be2f1e5f86171478cf4a9e24b2a414716cfa71fd.tar.gz
gentoo-be2f1e5f86171478cf4a9e24b2a414716cfa71fd.tar.bz2
gentoo-be2f1e5f86171478cf4a9e24b2a414716cfa71fd.zip
net-misc/dhcp: Removed old.
Package-Manager: Portage-2.3.69, Repoman-2.3.16 Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
Diffstat (limited to 'net-misc/dhcp/files/dhcp-4.2.4-always-accept-4.patch')
-rw-r--r--net-misc/dhcp/files/dhcp-4.2.4-always-accept-4.patch29
1 files changed, 0 insertions, 29 deletions
diff --git a/net-misc/dhcp/files/dhcp-4.2.4-always-accept-4.patch b/net-misc/dhcp/files/dhcp-4.2.4-always-accept-4.patch
deleted file mode 100644
index 6cec86c9d9c4..000000000000
--- a/net-misc/dhcp/files/dhcp-4.2.4-always-accept-4.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-https://bugs.gentoo.org/437108
-
-always accept the -4 option even if we don't have IPv6 support enabled.
-the relay code does this already.
-
---- a/client/dhclient.c
-+++ b/client/dhclient.c
-@@ -170,8 +170,8 @@ main(int argc, char **argv) {
- if (!strcmp(argv[i], "-r")) {
- release_mode = 1;
- no_daemon = 1;
--#ifdef DHCPv6
- } else if (!strcmp(argv[i], "-4")) {
-+#ifdef DHCPv6
- if (local_family_set && local_family != AF_INET)
- log_fatal("Client can only do v4 or v6, not "
- "both.");
---- a/server/dhcpd.c
-+++ b/server/dhcpd.c
-@@ -373,8 +373,8 @@ main(int argc, char **argv) {
- } else if (!strcmp (argv [i], "-q")) {
- quiet = 1;
- quiet_interface_discovery = 1;
--#ifdef DHCPv6
- } else if (!strcmp(argv[i], "-4")) {
-+#ifdef DHCPv6
- if (local_family_set && (local_family != AF_INET)) {
- log_fatal("Server cannot run in both IPv4 and "
- "IPv6 mode at the same time.");