[src/netbsd-1-6]: src Backout last change because it caused a build failure.

[tron <tron%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/bc78a6f95ee0
branches:  netbsd-1-6
changeset: 530995:bc78a6f95ee0
user:      tron <tron%NetBSD.org@localhost>
date:      Mon Oct 27 20:45:01 2003 +0000

description:
Backout last change because it caused a build failure.

diffstat:

 dist/dhcp/common/parse.c |  26 ++++++++------------------
 doc/CHANGES-1.6.2        |   9 +--------
 2 files changed, 9 insertions(+), 26 deletions(-)

diffs (92 lines):

diff -r 3c5f599ae15d -r bc78a6f95ee0 dist/dhcp/common/parse.c
--- a/dist/dhcp/common/parse.c  Mon Oct 27 20:31:57 2003 +0000
+++ b/dist/dhcp/common/parse.c  Mon Oct 27 20:45:01 2003 +0000
@@ -43,7 +43,7 @@
 
 #ifndef lint
 static char copyright[] =
-"$Id: parse.c,v 1.2.4.2 2003/10/27 20:30:23 tron Exp $ Copyright (c) 1995-2002 The Internet Software Consortium.  All rights reserved.\n";
+"$Id: parse.c,v 1.2.4.3 2003/10/27 20:45:01 tron Exp $ Copyright (c) 1995-2002 The Internet Software Consortium.  All rights reserved.\n";
 #endif /* not lint */
 
 #include "dhcpd.h"
@@ -284,11 +284,8 @@
                name = parse_host_name (cfile);
                if (!name)
                        return 0;
-               if (!make_host_lookup (expr, name)) {
-                       dfree(name, MDL);
+               if (!make_host_lookup (expr, name))
                        return 0;
-               }
-               dfree(name, MDL);
                if (!uniform) {
                        if (!make_limit (&x, *expr, 4))
                                return 0;
@@ -4035,11 +4032,7 @@
        }
 
        if (binop != expr_none) {
-         rhs_context = expression_context(rhs);
-         lhs_context = expression_context(lhs);
-
-         if ((rhs_context != context_any) && (lhs_context != context_any) &&
-                       (rhs_context != lhs_context)) {
+         if (expression_context (rhs) != expression_context (lhs)) {
            parse_warn (cfile, "illegal expression relating different types");
            skip_to_semi (cfile);
            expression_dereference (&rhs, MDL);
@@ -4051,10 +4044,9 @@
          switch(binop) {
            case expr_not_equal:
            case expr_equal:
-               if ((rhs_context != context_data_or_numeric) &&
-                   (rhs_context != context_data) &&
-                   (rhs_context != context_numeric) &&
-                   (rhs_context != context_any)) {
+               if ((expression_context(rhs) != context_data_or_numeric) &&
+                   (expression_context(rhs) != context_data) &&
+                   (expression_context(rhs) != context_numeric)) {
                        parse_warn (cfile, "expecting data/numeric expression");
                        skip_to_semi (cfile);
                        expression_dereference (&rhs, MDL);
@@ -4065,8 +4057,7 @@
 
            case expr_and:
            case expr_or:
-               if ((rhs_context != context_boolean) &&
-                   (rhs_context != context_any)) {
+               if (expression_context(rhs) != context_boolean) {
                        parse_warn (cfile, "expecting boolean expressions");
                        skip_to_semi (cfile);
                        expression_dereference (&rhs, MDL);
@@ -4083,8 +4074,7 @@
            case expr_binary_and:
            case expr_binary_or:
            case expr_binary_xor:
-               if ((rhs_context != context_numeric) &&
-                   (rhs_context != context_any)) {
+               if (expression_context(rhs) != context_numeric) {
                        parse_warn (cfile, "expecting numeric expressions");
                         skip_to_semi (cfile);
                         expression_dereference (&rhs, MDL);
diff -r 3c5f599ae15d -r bc78a6f95ee0 doc/CHANGES-1.6.2
--- a/doc/CHANGES-1.6.2 Mon Oct 27 20:31:57 2003 +0000
+++ b/doc/CHANGES-1.6.2 Mon Oct 27 20:45:01 2003 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: CHANGES-1.6.2,v 1.1.2.224 2003/10/27 20:31:57 tron Exp $
+#      $NetBSD: CHANGES-1.6.2,v 1.1.2.225 2003/10/27 20:45:01 tron Exp $
 
 A complete list of changes from NetBSD 1.6.1 to NetBSD 1.6.2:
 
@@ -2963,10 +2963,3 @@
 
         Update to 1.6.2_RC1
 
-dist/dhcp/common/parse.c                       1.6
-
-       - Apply patches from ISC DHCP 3.0.1rc12 to correct a parser bug that 
-       causes the ISC DHCP server to fail to start when it is configured to
-       use the ad-hoc DNS update mechanism. This fixes PR#20460 and PR#23284.
-       [mellon, ticket #1544]
-