From 1c779d3b51f3ab9031b30d370ec398e1b5819137 Mon Sep 17 00:00:00 2001
From: Thomas Markwalder <tmark@isc.org>
Date: Wed, 15 May 2019 09:39:26 -0400
Subject: [#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
---
 RELNOTES                 | 4 ++++
 client/dhclient.c        | 6 +++++-
 includes/omapip/isclib.h | 4 +++-
 omapip/isclib.c          | 4 +++-
 4 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/RELNOTES b/RELNOTES
index ad9cab2c..bead852f 100644
--- a/RELNOTES
+++ b/RELNOTES
@@ -109,6 +109,10 @@ by Eric Young (eay@cryptsoft.com).
   this dependency.
   [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)
 - none
 		Changes since 4.4.0 (Bug Fixes)
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)
 /*
diff --git a/includes/omapip/isclib.h b/includes/omapip/isclib.h
index 538b927f..7c807863 100644
--- a/includes/omapip/isclib.h
+++ b/includes/omapip/isclib.h
@@ -3,7 +3,7 @@
    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
  * 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);
 extern int shutdown_signal;
 
+#if defined (NSUPDATE)
 isc_result_t dns_client_init();
+#endif
 
 #endif /* ISCLIB_H */
diff --git a/omapip/isclib.c b/omapip/isclib.c
index db3b8952..cf150bab 100644
--- a/omapip/isclib.c
+++ b/omapip/isclib.c
@@ -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
  * 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 result;
 	if (dhcp_gbl_ctx.dnsclient == NULL) {
@@ -387,3 +388,4 @@ isc_result_t dns_client_init() {
 
 	return ISC_R_SUCCESS;
 }
+#endif // defined (NSUPDATE)
-- 
cgit v1.2.1