From: Thomas Markwalder <tmark@isc.org>
Date: Mon, 6 Jan 2020 16:25:21 +0000 (-0500)
Subject: [#72] Conditional compile out lease scrub log message
X-Git-Tag: v4_4_2~11
X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=5c23b618b2f54db287d678593172fb2def52b77b;p=thirdparty%2Fdhcp.git

[#72] Conditional compile out lease scrub log message

added a release note

server/failover.c
    scrub_lease() - wrap log message with DEBUG_FAILOVER_MESSAGES
---

diff --git a/RELNOTES b/RELNOTES
index 27c51f6ba..51c614543 100644
--- a/RELNOTES
+++ b/RELNOTES
@@ -110,6 +110,10 @@ by Eric Young (eay@cryptsoft.com).
   dhcpd.conf.5
   [Gitlab #37]
 
+- Only emit lease scrubbing log messages when DEBUG_FAILOVER_MESSAGES
+  is defined.
+  [Gitlab #72]
+
 		Changes since 4.4.1 (New Features)
 
 - A new configuration parameter, ping-cltt-secs (v4 operation only), has
diff --git a/server/failover.c b/server/failover.c
index 72f7b00ee..e3821eb09 100644
--- a/server/failover.c
+++ b/server/failover.c
@@ -6572,8 +6572,12 @@ const char *printable(const char* value) {
  * \param lease the lease to scrub
  */
 void scrub_lease(struct lease* lease, const char *file, int line) {
+#if defined (DEBUG_FAILOVER_MESSAGES)
+	/* While technically not associated with FO messaging this log statement
+	 * draws more questions then it helps, so we'll ifdef it out */
 	log_debug ("%s(%d):scrubbing lease for %s, hostname: %s", file, line,
 		   piaddr(lease->ip_addr), printable(lease->client_hostname));
+#endif 
 
         if (lease->client_hostname) {
                 dfree (lease->client_hostname, MDL);