1 files changed, 0 insertions, 44 deletions
diff --git a/main/dhcp/remove-duplicate-definitions.patch b/main/dhcp/remove-duplicate-definitions.patch
deleted file mode 100644
index 070f4a185e1..00000000000
--- a/main/dhcp/remove-duplicate-definitions.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From: Mike Crute <mike@crute.us>
-Date: Thu, 08 Oct 2020 05:25:00 +0000
-Subject: Remove duplicate definitions
-
-There are several duplicated definitions between the various servers and
-clients and the common library code in dhcpd. This patch removes the duplicates
-in the consumers and preserves the library code.
-
----
-
---- a/client/dhclient.c
-+++ b/client/dhclient.c
-@@ -83,8 +83,6 @@
- static const char url [] = "For info, please visit https://www.isc.org/software/dhcp/";
- #endif /* UNIT_TEST */
- 
--u_int16_t local_port = 0;
--u_int16_t remote_port = 0;
- #if defined(DHCPv6) && defined(DHCP4o6)
- int dhcp4o6_state = -1; /* -1 = stopped, 0 = polling, 1 = started */
- #endif
---- a/relay/dhcrelay.c.orig
-+++ b/relay/dhcrelay.c
-@@ -95,9 +95,6 @@
-        forward_untouched,	/* Forward without changes. */
-        discard } agent_relay_mode = forward_and_replace;
- 
--u_int16_t local_port;
--u_int16_t remote_port;
--
- /* Relay agent server list. */
- struct server_list {
- 	struct server_list *next;
---- a/server/mdb.c.orig
-+++ b/server/mdb.c
-@@ -67,8 +67,6 @@
- 
- int numclasseswritten;
- 
--omapi_object_type_t *dhcp_type_host;
--
- isc_result_t enter_class(cd, dynamicp, commit)
- 	struct class *cd;
- 	int dynamicp;