mir/isc-dhcp
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/dhcp synced 2025-08-25 11:27:31 +00:00
Code Issues Releases Wiki Activity

[#16,!9] Added missing NSUPDATE compilation logic

Browse Source 
Added a release note.

client/dhclient.c
    Only include dhclient_ddns_cb_free() if NSUPDATE is defined

includes/omapip/isclib.*
    Only inlucde isc_result_t dns_client_init() if NSUPDATE is defined
This commit is contained in:
Thomas Markwalder 2019-05-15 09:39:26 -04:00
parent 787b8c0368
commit 1c779d3b51
4 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
RELNOTES
View File

@ -109,6 +109,10 @@ by Eric Young (eay@cryptsoft.com).
this dependency. this dependency.
[ISC-Bugs #3,!1 git #cc35f84943df44dac2499f3e16e8aaba7d54191d] [ISC-Bugs #3,!1 git #cc35f84943df44dac2499f3e16e8aaba7d54191d]
- Corrected a compilation issue that occurred when building without DNS
update ability (e.g. by undefining NSUPDATE).
[ISC-Bugs, #16,!9 git #TBD]
Changes since 4.4.0 (New Features) Changes since 4.4.0 (New Features)
- none - none
Changes since 4.4.0 (Bug Fixes) Changes since 4.4.0 (Bug Fixes)

6
client/dhclient.c
View File

@ -3,7 +3,7 @@
DHCP Client. */ DHCP Client. */
/* /*
* Copyright (c) 2004-2018 by Internet Systems Consortium, Inc. ("ISC") * Copyright (c) 2004-2019 by Internet Systems Consortium, Inc. ("ISC")
* Copyright (c) 1995-2003 by Internet Software Consortium * Copyright (c) 1995-2003 by Internet Software Consortium
* *
* This Source Code Form is subject to the terms of the Mozilla Public * This Source Code Form is subject to the terms of the Mozilla Public
@ -120,8 +120,10 @@ static int check_domain_name_list(const char *ptr, size_t len, int dots);
static int check_option_values(struct universe *universe, unsigned int opt, static int check_option_values(struct universe *universe, unsigned int opt,
const char *ptr, size_t len); const char *ptr, size_t len);
#if defined(NSUPDATE)
static void dhclient_ddns_cb_free(dhcp_ddns_cb_t *ddns_cb, static void dhclient_ddns_cb_free(dhcp_ddns_cb_t *ddns_cb,
char* file, int line); char* file, int line);
#endif
/*! /*!
* *
@ -5382,6 +5384,7 @@ add_reject(struct packet *packet) {
log_info("Server added to list of rejected servers."); log_info("Server added to list of rejected servers.");
} }
#if defined(NSUPDATE)
/* Wrapper function around common ddns_cb_free function that ensures /* Wrapper function around common ddns_cb_free function that ensures
* we set the client_state pointer to the control block to NULL. */ * we set the client_state pointer to the control block to NULL. */
static void static void
@ -5395,6 +5398,7 @@ dhclient_ddns_cb_free(dhcp_ddns_cb_t *ddns_cb, char* file, int line) {
ddns_cb_free(ddns_cb, file, line); ddns_cb_free(ddns_cb, file, line);
} }
} }
#endif
#if defined(DHCPv6) && defined(DHCP4o6) #if defined(DHCPv6) && defined(DHCP4o6)
/* /*

4
includes/omapip/isclib.h
View File

@ -3,7 +3,7 @@
connections to the isc and dns libraries */ connections to the isc and dns libraries */
/* /*
* Copyright (c) 2009-2017 by Internet Systems Consortium, Inc. ("ISC") * Copyright (c) 2009-2019 by Internet Systems Consortium, Inc. ("ISC")
* *
* This Source Code Form is subject to the terms of the Mozilla Public * This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this * License, v. 2.0. If a copy of the MPL was not distributed with this
@ -141,6 +141,8 @@ void isclib_cleanup(void);
void dhcp_signal_handler(int signal); void dhcp_signal_handler(int signal);
extern int shutdown_signal; extern int shutdown_signal;
#if defined (NSUPDATE)
isc_result_t dns_client_init(); isc_result_t dns_client_init();
#endif
#endif /* ISCLIB_H */ #endif /* ISCLIB_H */

4
omapip/isclib.c
View File

@ -1,5 +1,5 @@
/* /*
* Copyright(c) 2009-2017 by Internet Systems Consortium, Inc.("ISC") * Copyright(c) 2009-2019 by Internet Systems Consortium, Inc.("ISC")
* *
* This Source Code Form is subject to the terms of the Mozilla Public * This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this * License, v. 2.0. If a copy of the MPL was not distributed with this
@ -351,6 +351,7 @@ void dhcp_signal_handler(int signal) {
} }
} }
#if defined (NSUPDATE)
isc_result_t dns_client_init() { isc_result_t dns_client_init() {
isc_result_t result; isc_result_t result;
if (dhcp_gbl_ctx.dnsclient == NULL) { if (dhcp_gbl_ctx.dnsclient == NULL) {
@ -387,3 +388,4 @@ isc_result_t dns_client_init() {
return ISC_R_SUCCESS; return ISC_R_SUCCESS;
} }
#endif // defined (NSUPDATE)