diff options
| author | Francis Dupont <fdupont@isc.org> | 2017-11-23 17:17:42 +0100 |
|---|---|---|
| committer | Francis Dupont <fdupont@isc.org> | 2017-11-23 17:17:42 +0100 |
| commit | ebe51f89cc99b870f2efe83df6dd9de27e983bf4 (patch) | |
| tree | e3f0eef5f68a3798a7bd282311829735a26f7cba | |
| parent | fc4f62fe471e1c2d8e13d9713e72bc732b635014 (diff) | |
| parent | afc56605f41d7f6ff03725c852ab64648f16dde8 (diff) | |
| download | isc-dhcp-ebe51f89cc99b870f2efe83df6dd9de27e983bf4.tar.gz | |
Merged rt44950 (MA compat)
| -rw-r--r-- | includes/dhctoken.h | 2 | ||||
| -rw-r--r-- | server/confpars.c | 5 |
2 files changed, 7 insertions, 0 deletions
diff --git a/includes/dhctoken.h b/includes/dhctoken.h index 6358726f..e9675147 100644 --- a/includes/dhctoken.h +++ b/includes/dhctoken.h @@ -39,6 +39,8 @@ enum dhcp_token { SLASH = '/', LBRACE = '{', RBRACE = '}', + LBRACKET = '[', + RBRACKET = ']', LPAREN = '(', RPAREN = ')', EQUAL = '=', diff --git a/server/confpars.c b/server/confpars.c index 5c314931..d2cedfe0 100644 --- a/server/confpars.c +++ b/server/confpars.c @@ -812,6 +812,11 @@ int parse_statement (cfile, group, type, host_decl, declaration) parse_lease_id_format(cfile); break; + case PERCENT: + /* Used by the MA so simply ignore... */ + skip_to_semi (cfile); + break; + default: et = (struct executable_statement *)0; lose = 0; |