- rt15979 integration error repairs [ISC-Bugs #16132]

diff --git a/server/confpars.c b/server/confpars.c
index 8eea3f0fb4ee581b3bff0c71932bdb49c01361b2..81914ba91aecfb05b6a1c0967805a350b4813e12 100644 (file)
--- a/server/confpars.c
+++ b/server/confpars.c
@@ -34,7 +34,7 @@
 
 #ifndef lint
 static char copyright[] =
-"$Id: confpars.c,v 1.154 2006/06/01 20:23:17 dhankins Exp $ Copyright (c) 2004-2006 Internet Systems Consortium.  All rights reserved.\n";
+"$Id: confpars.c,v 1.155 2006/06/02 17:11:49 dhankins Exp $ Copyright (c) 2004-2006 Internet Systems Consortium.  All rights reserved.\n";
 #endif /* not lint */
 
 #include "dhcpd.h"
@@ -3390,18 +3390,15 @@ int parse_allow_deny (oc, cfile, flag)
                token = next_token(&val, NULL, cfile);
                if (token != IS) {
                        parse_warn(cfile, "Expecting 'is reserved'.");
-                       status = 0;
-                       break;
+                       return 0;
                }
                token = next_token(&val, NULL, cfile);
                if (token != TOKEN_RESERVED) {
                        parse_warn(cfile, "Expecting 'reserved'.");
-                       status = 0;
-                       break;
+                       return 0;
                }
 
-               status = option_cache(oc, NULL, data,
-                               &server_options[SV_RESERVE_INFINITE], MDL);
+               code = SV_RESERVE_INFINITE;
                break;
 
              default: