From: Ted Lemon <source@isc.org>
Date: Fri, 6 Nov 1998 02:43:10 +0000 (+0000)
Subject: Put check_collection() outside of DEBUG_EXPRESSIONS conditional.
X-Git-Tag: carrel-2~27
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=78310bee2687facec7756116ec9fb2907e101f3b;p=thirdparty%2Fdhcp.git

Put check_collection() outside of DEBUG_EXPRESSIONS conditional.
---

diff --git a/common/tree.c b/common/tree.c
index 4fa4239b1..7bdb38a88 100644
--- a/common/tree.c
+++ b/common/tree.c
@@ -42,7 +42,7 @@
 
 #ifndef lint
 static char copyright[] =
-"$Id: tree.c,v 1.15 1998/11/06 01:06:16 mellon Exp $ Copyright (c) 1995, 1996, 1997, 1998 The Internet Software Consortium.  All rights reserved.\n";
+"$Id: tree.c,v 1.16 1998/11/06 02:43:10 mellon Exp $ Copyright (c) 1995, 1996, 1997, 1998 The Internet Software Consortium.  All rights reserved.\n";
 #endif /* not lint */
 
 #include "dhcpd.h"
@@ -284,8 +284,6 @@ int do_host_lookup (result, dns)
 	int i, count;
 	int new_len;
 
-	memset (&result, 0, sizeof result);
-
 #ifdef DEBUG_EVAL
 	debug ("time: now = %d  dns = %d %d  diff = %d",
 	       cur_time, dns -> timeout, cur_time - dns -> timeout);
@@ -396,8 +394,8 @@ int evaluate_boolean_expression (result, packet, options, expr)
 
 	switch (expr -> op) {
 	      case expr_check:
-#if defined (DEBUG_EXPRESSIONS)
 		*result = check_collection (packet, expr -> data.check);
+#if defined (DEBUG_EXPRESSIONS)
 		note ("bool: check (%s) returns %s",
 		      expr -> data.check -> name, *result ? "true" : "false");
 #endif