mir/isc-dhcp
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/dhcp synced 2025-08-29 13:28:14 +00:00
Code Issues Releases Wiki Activity

- Fix pretty printing of encapsulation options.

Browse Source 
- Fix parsing of vendor option space names.
This commit is contained in:
Ted Lemon 2000-11-24 03:38:18 +00:00
parent e1befbaa3a
commit f038ca8cc7
1 changed files with 21 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
client/clparse.c
View File

@ -43,7 +43,7 @@
#ifndef lint #ifndef lint
static char copyright[] = static char copyright[] =
"$Id: clparse.c,v 1.50 2000/10/10 19:44:39 mellon Exp $ Copyright (c) 1996-2000 The Internet Software Consortium. All rights reserved.\n"; "$Id: clparse.c,v 1.51 2000/11/24 03:38:18 mellon Exp $ Copyright (c) 1996-2000 The Internet Software Consortium. All rights reserved.\n";
#endif /* not lint */ #endif /* not lint */
#include "dhcpd.h" #include "dhcpd.h"
@ -486,7 +486,16 @@ void parse_client_statement (cfile, ip, config)
skip_to_semi (cfile); skip_to_semi (cfile);
return; return;
} }
config -> vendor_space_name = parse_string (cfile); token = next_token (&val, cfile);
if (!is_identifier (token)) {
parse_warn (cfile, "expecting an identifier.");
skip_to_semi (cfile);
return;
}
config -> vendor_space_name = dmalloc (strlen (val) + 1, MDL);
if (!config -> vendor_space_name)
log_fatal ("no memory for vendor option space name.");
strcpy (config -> vendor_space_name, val);
for (i = 0; i < universe_count; i++) for (i = 0; i < universe_count; i++)
if (!strcmp (universes [i] -> name, if (!strcmp (universes [i] -> name,
config -> vendor_space_name)) config -> vendor_space_name))
@ -495,6 +504,7 @@ void parse_client_statement (cfile, ip, config)
log_error ("vendor option space %s not found.", log_error ("vendor option space %s not found.",
config -> vendor_space_name); config -> vendor_space_name);
} }
parse_semi (cfile);
return; return;
case INTERFACE: case INTERFACE:
@ -1093,6 +1103,15 @@ int parse_option_decl (oc, cfile)
if (*fmt == 'A') if (*fmt == 'A')
break; break;
switch (*fmt) { switch (*fmt) {
case 'E':
fmt = strchr (fmt, '.');
if (!fmt) {
parse_warn (cfile,
"malformed %s (bug!)",
"encapsulation format");
skip_to_semi (cfile);
return 0;
}
case 'X': case 'X':
len = parse_X (cfile, &hunkbuf [hunkix], len = parse_X (cfile, &hunkbuf [hunkix],
sizeof hunkbuf - hunkix); sizeof hunkbuf - hunkix);