diff options
| author | David Hankins <dhankins@isc.org> | 2009-07-16 18:07:00 +0000 |
|---|---|---|
| committer | David Hankins <dhankins@isc.org> | 2009-07-16 18:07:00 +0000 |
| commit | f457da5ff36978d05a1af12126c6854f1ebe759f (patch) | |
| tree | 5cf52a991b9e2290d9ba8ca47608ed99e1c64e14 /common | |
| parent | 39bc5384e6b82696cf9324313f818fd472671d72 (diff) | |
| download | isc-dhcp-f457da5ff36978d05a1af12126c6854f1ebe759f.tar.gz | |
- Versions 3.0.x syntax with multiple name->code option definitions is now
supported. Note that, similarly to 3.0.x, for by-code lookups only the
last option definition is used. [ISC-Bugs #17613]
Diffstat (limited to 'common')
| -rw-r--r-- | common/parse.c | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/common/parse.c b/common/parse.c index f5e5197d..7ec68fc6 100644 --- a/common/parse.c +++ b/common/parse.c @@ -34,7 +34,7 @@ #ifndef lint static char copyright[] = -"$Id: parse.c,v 1.117.8.9 2009/02/03 23:51:44 dhankins Exp $ Copyright (c) 2004-2008 Internet Systems Consortium. All rights reserved.\n"; +"$Id: parse.c,v 1.117.8.10 2009/07/16 18:07:00 dhankins Exp $ Copyright (c) 2004-2008 Internet Systems Consortium. All rights reserved.\n"; #endif /* not lint */ #include "dhcpd.h" @@ -1554,9 +1554,18 @@ int parse_option_code_definition (cfile, option) oldopt = NULL; option_code_hash_lookup(&oldopt, option->universe->code_hash, &option->code, 0, MDL); - if (oldopt) { + if (oldopt != NULL) { + /* + * XXX: This illegalizes a configuration syntax that was + * valid in 3.0.x, where multiple name->code mappings are + * given, but only one code->name mapping survives. It is + * unclear what can or should be done at this point, but it + * seems best to retain 3.0.x behaviour for upgrades to go + * smoothly. + * option_name_hash_delete(option->universe->name_hash, oldopt->name, 0, MDL); + */ option_code_hash_delete(option->universe->code_hash, &oldopt->code, 0, MDL); |