From 66bea4d912e8186e29fa43cbd7793b5ca9fcc8b9 Mon Sep 17 00:00:00 2001
From: Andreas Gustafsson <source@isc.org>
Date: Thu, 25 Oct 2001 17:47:16 +0000
Subject: [PATCH] if() condition in check_expire_entry did not have the effect
 I think was intended due to operator precedence: || binds tighter than ?:.
 Rewrote it without :?.

---
 lib/dns/adb.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/dns/adb.c b/lib/dns/adb.c
index 87216fadf9..019de26851 100644
--- a/lib/dns/adb.c
+++ b/lib/dns/adb.c
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: adb.c,v 1.184 2001/10/25 04:57:42 marka Exp $ */
+/* $Id: adb.c,v 1.185 2001/10/25 17:47:16 gson Exp $ */
 
 /*
  * Implementation notes
@@ -2037,7 +2037,7 @@ check_expire_entry(dns_adb_t *adb, dns_adbentry_t **entryp, isc_stdtime_t now)
 	} else
 		expire = ISC_FALSE;
 
-	if (entry->expires == 0 || expire ? ISC_FALSE : entry->expires > now)
+	if (entry->expires == 0 || (! expire && entry->expires > now))
 		return;
 	/*
 	 * The entry is not in use.  Delete it.