[master] Remove some incorrect #ifdefs

As part of 33990 we removed some #ifdefs for DEBUG_MEMORY
but we didn't get all of them.  Remove the extra ones.

diff --git a/RELNOTES b/RELNOTES
index aa72b1b888026c69e58c5f24320942a65e2c6a57..17e8bc6df5c44b441fc20a85a49cff26f22f3e10 100644 (file)
--- a/RELNOTES
+++ b/RELNOTES
@@ -111,6 +111,7 @@ by Eric Young (eay@cryptsoft.com).
   host objects. Thanks to Jiri Popelka at Red Hat for reporting
   the issue and supplying the patches.
   [ISC-Bugs #33990]
+  [ISC-Bugs #41325]
 
 - Cleaned up some of the Make infrastructure to make --with-libbind
   work better.  Though it still only works with an absolute path.

diff --git a/includes/dhcpd.h b/includes/dhcpd.h
index 1cf66d33fc0fbe99021ae876b2f3eaf154ee605a..230df59f82a3e3bea03b297ff96bd8a3a20cd617 100644 (file)
--- a/includes/dhcpd.h
+++ b/includes/dhcpd.h
@@ -3,7 +3,7 @@
    Definitions for dhcpd... */
 
 /*
- * Copyright (c) 2004-2015 by Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (c) 2004-2016 by Internet Systems Consortium, Inc. ("ISC")
  * Copyright (c) 1996-2003 by Internet Software Consortium
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -237,7 +237,7 @@ typedef time_t TIME;
  * based on which is in use to allow the code to be cleaner by
  * avoiding #ifdefs.
  *
- * POOL_DESTROYP is used for debugging purposes
+ * POOL_DESTROYP is used for cleanup
  */
 
 #if !defined (BINARY_LEASES)
@@ -3757,10 +3757,7 @@ void lc_unlink_lease(struct leasechain *lc, struct lease *lp);
 struct lease *lc_get_first_lease(struct leasechain *lc);
 struct lease *lc_get_next(struct leasechain *lc, struct lease *lp);
 void lc_init_growth(struct leasechain *lc, size_t growth);
-#if defined (DEBUG_MEMORY_LEAKAGE) || \
-               defined (DEBUG_MEMORY_LEAKAGE_ON_EXIT)
 void lc_delete_all(struct leasechain *lc);
-#endif
 #endif /* BINARY_LEASES */
 
 #define MAX_ADDRESS_STRING_LEN \

diff --git a/server/leasechain.c b/server/leasechain.c
index d394526d9184e0d63128a18976c95e76968a91a0..bf6a2bf94c8a8cc907cace151b03647b6f3c46f7 100644 (file)
--- a/server/leasechain.c
+++ b/server/leasechain.c
@@ -3,7 +3,7 @@
    Additional support for in-memory database support */
 
 /*
- * Copyright (c) 2015 by Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (c) 2015-2016 by Internet Systems Consortium, Inc. ("ISC")
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -647,8 +647,6 @@ lc_unlink_lease(struct leasechain *lc, struct lease *lp) {
        lc_unlink_lease_pos(lc, pos);
 }
 
-#if defined (DEBUG_MEMORY_LEAKAGE) || \
-               defined (DEBUG_MEMORY_LEAKAGE_ON_EXIT)
 /*!
  *
  * \brief Unlink all the leases in the lease chain and free the
@@ -677,7 +675,6 @@ lc_delete_all(struct leasechain *lc) {
        lc->total = 0;
        lc->nelem = 0;
 }
-#endif
 
 /*!
  *