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

diff --git a/common/parse.c b/common/parse.c
index 05acf3975c0a2d5a12b6fdaca1f7732b57aeb150..5347de8ba9b8c623f8ad733ccb4d9aae14522000 100644 (file)
--- 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)))