summaryrefslogtreecommitdiff
path: root/client
diff options
context:
space:
mode:
authorThomas Markwalder <tmark@isc.org>2019-05-15 09:39:26 -0400
committerThomas Markwalder <tmark@isc.org>2019-05-15 09:39:26 -0400
commit1c779d3b51f3ab9031b30d370ec398e1b5819137 (patch)
tree45fa5edfe4bcd506735a5dfaf919c60092fb4fe8 /client
parent787b8c03684e82c4738fdb1c3a73349e7a412e76 (diff)
downloadisc-dhcp-1c779d3b51f3ab9031b30d370ec398e1b5819137.tar.gz
[#16,!9] Added missing NSUPDATE compilation logic
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
Diffstat (limited to 'client')
-rw-r--r--client/dhclient.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/client/dhclient.c b/client/dhclient.c
index 825ab00f..313394f3 100644
--- a/client/dhclient.c
+++ b/client/dhclient.c
@@ -3,7 +3,7 @@
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
*
* 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,
const char *ptr, size_t len);
+#if defined(NSUPDATE)
static void dhclient_ddns_cb_free(dhcp_ddns_cb_t *ddns_cb,
char* file, int line);
+#endif
/*!
*
@@ -5382,6 +5384,7 @@ add_reject(struct packet *packet) {
log_info("Server added to list of rejected servers.");
}
+#if defined(NSUPDATE)
/* Wrapper function around common ddns_cb_free function that ensures
* we set the client_state pointer to the control block to NULL. */
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);
}
}
+#endif
#if defined(DHCPv6) && defined(DHCP4o6)
/*