From: Ted Lemon <source@isc.org>
Date: Tue, 20 Jul 1999 13:24:39 +0000 (+0000)
Subject: Fix another bug that Brian cleverly tracked down... :')
X-Git-Tag: V3-BETA-1-PATCH-2~5^2~174
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=392208d3823684e0b102b222b3f01d6a2e7401b9;p=thirdparty%2Fdhcp.git

Fix another bug that Brian cleverly tracked down... :')
---

diff --git a/common/parse.c b/common/parse.c
index 05acf3975..5347de8ba 100644
--- a/common/parse.c
+++ b/common/parse.c
@@ -22,7 +22,7 @@
 
 #ifndef lint
 static char copyright[] =
-"$Id: parse.c,v 1.32 1999/07/19 20:10:12 mellon Exp $ Copyright (c) 1995, 1996, 1997, 1998, 1999 The Internet Software Consortium.  All rights reserved.\n";
+"$Id: parse.c,v 1.33 1999/07/20 13:24:39 mellon Exp $ Copyright (c) 1995, 1996, 1997, 1998, 1999 The Internet Software Consortium.  All rights reserved.\n";
 #endif /* not lint */
 
 #include "dhcpd.h"
@@ -1855,7 +1855,6 @@ int parse_non_binary (expr, cfile, lose, context)
 		if (!(expression_allocate
 		      (expr, "parse_expression: PICK_FIRST_VALUE")))
 			log_fatal ("can't allocate expression");
-		(*expr) -> op = expr_pick_first_value;
 
 		token = next_token (&val, cfile);
 		if (token != LPAREN)
@@ -1863,7 +1862,7 @@ int parse_non_binary (expr, cfile, lose, context)
 
 		nexp = *expr;
 		do {
-			struct expression *tmp = (struct expression *)0;
+			nexp -> op = expr_pick_first_value;
 			if (!(parse_data_expression
 			      (&nexp -> data.pick_first_value.car,
 			       cfile, lose)))