blob: 070f4a185e119cfa44039c02b18a997c1c223b0f (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
|
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;
|
