From: Arran Cudbard-Bell <a.cudbardb@freeradius.org>
Date: Thu, 29 Jun 2017 01:35:50 +0000 (-0400)
Subject: Fix unused macros and extern
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6b054cfd66fc38c0c4a47d5ee67e4ffc9cde0d07;p=thirdparty%2Ffreeradius-server.git

Fix unused macros and extern
---

diff --git a/src/modules/proto_dhcpv4/dhcpclient.c b/src/modules/proto_dhcpv4/dhcpclient.c
index 029ec5775be..1e530bfb44d 100644
--- a/src/modules/proto_dhcpv4/dhcpclient.c
+++ b/src/modules/proto_dhcpv4/dhcpclient.c
@@ -54,8 +54,6 @@ static float timeout = 5.0;
 static struct timeval tv_timeout;
 
 static int sockfd;
-#define ETH_ADDR_LEN   6
-
 #ifdef HAVE_LIBPCAP
 static fr_pcap_t	*pcap;
 #endif
@@ -68,13 +66,8 @@ static struct sockaddr_ll ll;	/* Socket address structure */
 #endif
 
 static bool raw_mode = false;
-
 static bool reply_expected = true;
 
-#define DHCP_CHADDR_LEN	(16)
-#define DHCP_SNAME_LEN	(64)
-#define DHCP_FILE_LEN	(128)
-
 static char const *dhcpclient_version = RADIUSD_VERSION_STRING_BUILD("dhcpclient");
 
 /* structure to keep track of offered IP addresses */
diff --git a/src/modules/proto_dhcpv4/rlm_dhcpv4.c b/src/modules/proto_dhcpv4/rlm_dhcpv4.c
index eddc0c6b8d6..da1917c97d5 100644
--- a/src/modules/proto_dhcpv4/rlm_dhcpv4.c
+++ b/src/modules/proto_dhcpv4/rlm_dhcpv4.c
@@ -221,7 +221,7 @@ static int dhcp_load(void)
  *	The server will then take care of ensuring that the module
  *	is single-threaded.
  */
-extern rad_module_t rlm_dhcp;
+extern rad_module_t rlm_dhcpv4;
 rad_module_t rlm_dhcpv4 = {
 	.magic		= RLM_MODULE_INIT,
 	.name		= "dhcpv4",