From: Alan T. DeKok Date: Wed, 30 May 2012 13:34:09 +0000 (+0200) Subject: Fix compiler warnings X-Git-Tag: release_3_0_0_beta0~161 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a3c72685ca47af2d545766e27c51f1b303e9d92e;p=thirdparty%2Ffreeradius-server.git Fix compiler warnings --- diff --git a/src/main/dhcpd.c b/src/main/dhcpd.c index 690152fb63a..33134ba2f12 100644 --- a/src/main/dhcpd.c +++ b/src/main/dhcpd.c @@ -65,6 +65,7 @@ typedef struct dhcp_socket_t { RADCLIENT dhcp_client; } dhcp_socket_t; +#ifdef PORTED_FROM_220 static int dhcprelay_process_client_request(REQUEST *request) { uint8_t maxhops = 16; @@ -231,6 +232,7 @@ static int dhcprelay_process_server_reply(REQUEST *request) return fr_dhcp_send(request->packet); } +#endif /* PORTED_FROM_220 */ static int dhcp_process(REQUEST *request) { @@ -462,13 +464,15 @@ static int dhcp_socket_parse(CONF_SECTION *cs, rad_listen_t *this) /* * Initialize the fake client. + * + * FIXME: add dhcp_socket_free() to free up this memory... */ client = &sock->dhcp_client; memset(client, 0, sizeof(*client)); client->ipaddr.af = AF_INET; client->ipaddr.ipaddr.ip4addr.s_addr = INADDR_NONE; client->prefix = 0; - client->longname = client->shortname = "dhcp"; + client->longname = client->shortname = strdup("dhcp"); client->secret = client->shortname; client->nastype = strdup("none");