mir/isc-dhcp
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/dhcp synced 2025-09-02 15:25:48 +00:00
Code Issues Releases Wiki Activity

Fix two bugs in class parsing.

Browse Source
This commit is contained in:
Ted Lemon
2000-09-01 00:10:26 +00:00
parent b40955450c
commit b19f2e1c31
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
server/confpars.c
View File

@@ -43,7 +43,7 @@
#ifndef lint #ifndef lint
static char copyright[] = static char copyright[] =
"$Id: confpars.c,v 1.124 2000/08/31 04:39:41 mellon Exp $ Copyright (c) 1995-2000 The Internet Software Consortium. All rights reserved.\n"; "$Id: confpars.c,v 1.125 2000/09/01 00:10:26 mellon Exp $ Copyright (c) 1995-2000 The Internet Software Consortium. All rights reserved.\n";
#endif /* not lint */ #endif /* not lint */
#include "dhcpd.h" #include "dhcpd.h"
@@ -1603,8 +1603,8 @@ int parse_class_declaration (cp, cfile, group, type)
memset (&data, 0, sizeof data); memset (&data, 0, sizeof data);
if (!parse_cshl (&data, cfile)) { if (!parse_cshl (&data, cfile)) {
class_dereference (&pc, MDL); class_dereference (&pc, MDL);
}
return 0; return 0;
}
} else { } else {
parse_warn (cfile, "Expecting string or hex list."); parse_warn (cfile, "Expecting string or hex list.");
class_dereference (&pc, MDL); class_dereference (&pc, MDL);
@@ -1744,6 +1744,8 @@ int parse_class_declaration (cp, cfile, group, type)
break; break;
} }
token = next_token (&val, cfile); token = next_token (&val, cfile);
class -> spawning = 1;
submatch:
token = next_token (&val, cfile); token = next_token (&val, cfile);
if (token != WITH) { if (token != WITH) {
parse_warn (cfile, parse_warn (cfile,
@@ -1751,8 +1753,6 @@ int parse_class_declaration (cp, cfile, group, type)
skip_to_semi (cfile); skip_to_semi (cfile);
break; break;
} }
class -> spawning = 1;
submatch:
if (class -> submatch) { if (class -> submatch) {
parse_warn (cfile, parse_warn (cfile,
"can't override existing %s.", "can't override existing %s.",