diff options
| author | Francis Dupont <fdupont@isc.org> | 2018-11-09 13:42:51 +0100 |
|---|---|---|
| committer | Francis Dupont <fdupont@isc.org> | 2019-11-12 09:02:23 +0100 |
| commit | 3a495736032516609cb16181d94f7628b521da2a (patch) | |
| tree | b346cfa0675fea4d7a9f528409521a4b9ff9737f | |
| parent | 8d1429756c67077e165885a721c157d1d1fb8c5d (diff) | |
| download | isc-dhcp-3a495736032516609cb16181d94f7628b521da2a.tar.gz | |
Implemented authoritative
288 files changed, 874 insertions, 1350 deletions
diff --git a/keama/confparse.c b/keama/confparse.c index cd628fb3..e36d9bba 100644 --- a/keama/confparse.c +++ b/keama/confparse.c @@ -46,7 +46,7 @@ isc_boolean_t use_hw_address = ISC_FALSE; const struct option *host_id_option = NULL; int host_id_relays = 0; -/* To avoid late authoritative declaration */ +/* Simple or complex config */ unsigned subnet_counter = 0; /* For subclass name generation */ @@ -73,7 +73,6 @@ struct range { TAILQ_HEAD(ranges, range) known_ranges; -static void post_process_authoritative(struct parse *); static size_t post_process_reservations(struct parse *); static void post_process_classes(struct parse *); static void post_process_generated_classes(struct parse *); @@ -139,7 +138,7 @@ conf_file_parse(struct parse *cfile) issues = conf_file_subparse(cfile, ROOT_GROUP); /* Add a warning when interfaces-config is not present */ - if (!partial && (subnet_counter > 0)) { + if (subnet_counter > 0) { struct element *ifconf; ifconf = mapGet(cfile->stack[1], "interfaces-config"); @@ -155,7 +154,6 @@ conf_file_parse(struct parse *cfile) } } - post_process_authoritative(cfile); issues += post_process_reservations(cfile); post_process_classes(cfile); post_process_generated_classes(cfile); @@ -164,15 +162,6 @@ conf_file_parse(struct parse *cfile) return issues; } -/* Cleanup authoritative */ - -static void -post_process_authoritative(struct parse *cfile) -{ - if (mapContains(cfile->stack[1], "authoritative")) - mapRemove(cfile->stack[1], "authoritative"); -} - /* Reservation post-processing */ static size_t @@ -805,39 +794,33 @@ parse_statement(struct parse *cfile, int type, isc_boolean_t declaration) parse_error(cfile, "expecting assertion"); } break; + case AUTHORITATIVE: skip_token(&val, NULL, cfile); authoritative = ISC_TRUE; authoritative: - if (type == ROOT_GROUP) { - if (subnet_counter > 0) - goto late_authoritative; - } else if (type == SHARED_NET_DECL) { - struct element *subnets; - - subnets = mapGet(cfile->stack[cfile->stack_top], - local_family == AF_INET ? - "subnet4" : "subnet6"); - if ((subnets == NULL) || - (subnets->type != ELEMENT_LIST)) - parse_error(cfile, "can't get subnets from " - "shared-network"); - if (listSize(subnets) > 0) - late_authoritative: - parse_error(cfile, "too late authoritative " - "declaration"); - } else if (type != SUBNET_DECL) + if (type == HOST_DECL) parse_error(cfile, "authority makes no sense here."); - if (mapContains(cfile->stack[cfile->stack_top], - "authoritative")) - parse_error(cfile, "authoritative was already " - "declared in this scope"); - cache = createBool(authoritative); - cache->skip = ISC_TRUE; - TAILQ_CONCAT(&cache->comments, &cfile->comments); - mapSet(cfile->stack[cfile->stack_top], cache, "authoritative"); - if (!authoritative || (type != ROOT_GROUP)) - cfile->issue_counter++; + if (!subnet) { + for (i = cfile->stack_top; i > 0; --i) { + int kind; + + kind = cfile->stack[i]->kind; + if ((kind == SUBNET_DECL) || + (kind == SHARED_NET_DECL) || + (kind == ROOT_GROUP)) { + subnet = i; + break; + } + } + } + if (!subnet) + parse_error(cfile, "can't find root group"); + if (local_family == AF_INET) { + cache = createBool(authoritative); + TAILQ_CONCAT(&cache->comments, &cfile->comments); + mapSet(cfile->stack[subnet], cache, "authoritative"); + } parse_semi(cfile); break; @@ -2137,10 +2120,6 @@ parse_shared_net_declaration(struct parse *cfile) cfile->stack_top--; - /* The declaration is closed so authoritative entry now useless */ - if (mapContains(share, "authoritative")) - mapRemove(share, "authoritative"); - if (listSize(subnets) == 0) parse_error(cfile, "empty shared-network decl"); if (listSize(subnets) > 1) { @@ -2263,7 +2242,6 @@ common_subnet_parsing(struct parse *cfile, enum dhcp_token token; const char *val; struct element *interface; - struct element *authoritative; int declaration = 0; parse_lbrace(cfile); @@ -2297,44 +2275,6 @@ common_subnet_parsing(struct parse *cfile, cfile->stack_top--; - /* Check authority */ - authoritative = mapGet(subnet, "authoritative"); - if (authoritative == NULL) { - struct element *scope; - size_t i; - - for (i = cfile->stack_top; i > 0; --i) { - scope = cfile->stack[i]; - - if ((scope->kind == ROOT_GROUP) || - (scope->kind == SHARED_NET_DECL) || - (scope->kind == GROUP_DECL)) - authoritative = mapGet(scope, "authoritative"); - if (authoritative != NULL) - break; - } - } - if (!partial && (authoritative == NULL)) - parse_error(cfile, - "missing top level authoritative statement"); - if (!partial && (!boolValue(authoritative))) { - struct comment *comment; - - comment = createComment("/// Not authorized subnet"); - TAILQ_INSERT_TAIL(&subnet->comments, comment); - comment = createComment("/// This feature is not supported by " - "Kea"); - TAILQ_INSERT_TAIL(&subnet->comments, comment); - comment = createComment("/// Skipping the subnet only " - "partially simulates it"); - TAILQ_INSERT_TAIL(&subnet->comments, comment); - subnet->skip = ISC_TRUE; - cfile->issue_counter++; - } - /* authoritative entry is now useless */ - if (mapContains(subnet, "authoritative")) - mapRemove(subnet, "authoritative"); - /* Add the subnet to the list of subnets in this shared net. */ listPush(subnets, subnet); @@ -2776,16 +2716,13 @@ close_group(struct parse *cfile, struct element *group) (strcmp(handle->key, "host-identifier") == 0) || (strcmp(handle->key, "flex-id") == 0) || (strcmp(handle->key, "test") == 0) || + (strcmp(handle->key, "authoritative") == 0) || (strcmp(handle->key, "dhcp-ddns") == 0) || (strcmp(handle->key, "host-reservation-identifiers") == 0)) parse_error(cfile, "unexpected parameter %s " "in group at %u", handle->key, order); - /* to drop */ - if (strcmp(handle->key, "authoritative") == 0) { - free(handle); - continue; - } + /* to parent at group position */ if ((strcmp(handle->key, "option-space") == 0) || (strcmp(handle->key, "server-duid") == 0) || diff --git a/keama/doc.txt b/keama/doc.txt index 6d523a64..f00a6557 100644 --- a/keama/doc.txt +++ b/keama/doc.txt @@ -405,16 +405,6 @@ Pools: and IMHO more powerful model. Pool6 permissions are not supported. -Authoritative declaration: --------------------------- - No problem when set in the global scope and nothing else, so raise - an error when parsing finishes without a positive authoritative declaration. - Used no make some subnets known: ISC DHCP uses these subnets for - subnet selection but sends no response including to info only. - This is a feature without equivalent in Kea but IMHO not required. - Negative authoritative declarations are used as a kind of disabling - some parts so the MA comments them. - Failover: --------- Display a warning on the first use. @@ -437,12 +427,12 @@ TODO: check the multiple address comment is correctly taken Options: -------- - Some options are known only in ISC DHCP (fixed), a few only by Kea. + Some options are known only in ISC DHCP (almost fixed), a few only by Kea. Formats are supposed to be the same, the only known exception (DHCPv4 domain-search) was fixed by #5087. For option spaces DHCPv4 vendor-encapsulated-options (code 43, in general associated to vendor-class-identifier code 60) uses a dedicated feature - which has currently no equivalent in Kea (fixed). + which had no equivalent in Kea (fixed). Option definitions are convertible with a few exception: - no support in Kea for an array of records (mainly by the lack of a corresponding syntax). BTW there is no known use too. @@ -520,6 +510,5 @@ Variables: to recognize booleans and numbers. Unfortunately this is very specific... TODO: - - align/rebase to 4.4.0-alpha - class like if statement - add more tests for classes in pools and class generation diff --git a/keama/keama.8 b/keama/keama.8 index 194cf981..c203d082 100644 --- a/keama/keama.8 +++ b/keama/keama.8 @@ -69,10 +69,6 @@ option. The input configuration is for DHCPv6. Incompatible with the \fB-4\fR option. .TP --A -The input is partial, for instance no \fBauthoritative\fR global statement -is expected. -.TP -r \fIaction\fR Specify what to do with hostnames: resolve them into their first address, raise a fatal error or pass them silently. diff --git a/keama/keama.c b/keama/keama.c index a8171396..2d91b905 100644 --- a/keama/keama.c +++ b/keama/keama.c @@ -1,5 +1,5 @@ /* - * Copyright(c) 2017 by Internet Systems Consortium, Inc.("ISC") + * Copyright(c) 2017, 2018 by Internet Systems Consortium, Inc.("ISC") * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -53,7 +53,6 @@ char *output_file = NULL; FILE *input = NULL; FILE *output = NULL; isc_boolean_t json = ISC_FALSE; -isc_boolean_t partial = ISC_FALSE; static const char use_noarg[] = "No argument for command: %s"; static const char bad_resolve[] = "Bad -r argument: %s"; @@ -73,8 +72,6 @@ main(int argc, char **argv) { local_family = AF_INET; else if (strcmp(argv[i], "-6") == 0) local_family = AF_INET6; - else if (strcmp(argv[i], "-A") == 0) - partial = ISC_TRUE; else if (strcmp(argv[i], "-T") == 0) json = ISC_TRUE; else if (strcmp(argv[i], "-r") == 0) { diff --git a/keama/keama.h b/keama/keama.h index 32233a29..ae842223 100644 --- a/keama/keama.h +++ b/keama/keama.h @@ -300,7 +300,6 @@ struct option { void stackPush(struct parse *cfile, struct element *elem); /* From command line */ -extern isc_boolean_t partial; extern char *hook_library_path; /* From common/parse.c */ diff --git a/keama/tests/ba/kea.json b/keama/tests/ba/kea.json index 571b88d2..3814dd3f 100644 --- a/keama/tests/ba/kea.json +++ b/keama/tests/ba/kea.json @@ -126,6 +126,7 @@ "dhcp-ddns": { "enable-updates": false }, + "authoritative": true, "valid-lifetime": 360000, // "statement": { // "config": { diff --git a/keama/tests/badcasexsc.err b/keama/tests/badcasexsc.err index 7b18f283..9cfdd87c 100644 --- a/keama/tests/badcasexsc.err +++ b/keama/tests/badcasexsc.err @@ -1,8 +1,5 @@ # bad case executable statement construct -# authoritative is mandatory -authoritative; - # empty configs are not accepted by Kea default-lease-time 1800; diff --git a/keama/tests/badcasexsc.msg b/keama/tests/badcasexsc.msg index ce956fce..636bb31a 100644 --- a/keama/tests/badcasexsc.msg +++ b/keama/tests/badcasexsc.msg @@ -1 +1 @@ -badcasexsc.err line 10: case statement in inappropriate scope. +badcasexsc.err line 7: case statement in inappropriate scope. diff --git a/keama/tests/badclass.err b/keama/tests/badclass.err index 067345c2..8dc59c05 100644 --- a/keama/tests/badclass.err +++ b/keama/tests/badclass.err @@ -1,8 +1,5 @@ # bad (double match-if) class declaration config -# authoritative is mandatory -authoritative; - # options option mysystem code 250 = text; option myversion code 251 = unsigned integer 16; diff --git a/keama/tests/badclass.msg b/keama/tests/badclass.msg index fa1d033f..69a603ab 100644 --- a/keama/tests/badclass.msg +++ b/keama/tests/badclass.msg @@ -1 +1 @@ -badclass.err line 13: A class may only have one 'match if' clause. +badclass.err line 10: A class may only have one 'match if' clause. diff --git a/keama/tests/badclass2.err b/keama/tests/badclass2.err index 14f0bd48..551a1729 100644 --- a/keama/tests/badclass2.err +++ b/keama/tests/badclass2.err @@ -1,8 +1,5 @@ # bad (2 match) class declaration config -# authoritative is mandatory -authoritative; - # options option mysystem code 250 = text; option myversion code 251 = unsigned integer 16; diff --git a/keama/tests/badclass2.msg b/keama/tests/badclass2.msg index b79865b3..3afd2b3b 100644 --- a/keama/tests/badclass2.msg +++ b/keama/tests/badclass2.msg @@ -1 +1 @@ -badclass2.err line 13: can't override existing submatch/spawn +badclass2.err line 10: can't override existing submatch/spawn diff --git a/keama/tests/baddefaultxsc.err b/keama/tests/baddefaultxsc.err index 65b08ab5..69157dd4 100644 --- a/keama/tests/baddefaultxsc.err +++ b/keama/tests/baddefaultxsc.err @@ -1,8 +1,5 @@ # bad default executable statement construct -# authoritative is mandatory -authoritative; - # empty configs are not accepted by Kea default-lease-time 1800; diff --git a/keama/tests/baddefaultxsc.msg b/keama/tests/baddefaultxsc.msg index afe9db92..7780a1bb 100644 --- a/keama/tests/baddefaultxsc.msg +++ b/keama/tests/baddefaultxsc.msg @@ -1 +1 @@ -baddefaultxsc.err line 10: switch default statement in inappropriate scope. +baddefaultxsc.err line 7: switch default statement in inappropriate scope. diff --git a/keama/tests/badduid.err b/keama/tests/badduid.err index 36545d59..c3acab31 100644 --- a/keama/tests/badduid.err +++ b/keama/tests/badduid.err @@ -1,7 +1,4 @@ # bad (no type) server duid config -# authoritative is mandatory -authoritative; - # server duid declaration server-duid "enterprise-specific-identifier-1234"; diff --git a/keama/tests/badduid.msg b/keama/tests/badduid.msg index 3d0b373e..ebcaade4 100644 --- a/keama/tests/badduid.msg +++ b/keama/tests/badduid.msg @@ -1 +1 @@ -badduid.err line 7: DUID type of LLT, EN, or LL expected +badduid.err line 4: DUID type of LLT, EN, or LL expected diff --git a/keama/tests/bintadx6.in6 b/keama/tests/bintadx6.in6 index 2d51365f..dc0cede7 100644 --- a/keama/tests/bintadx6.in6 +++ b/keama/tests/bintadx6.in6 @@ -1,8 +1,5 @@ # binary-to-ascii data expression -# authoritative is mandatory -authoritative; - # empty configs are not accepted by Kea default-lease-time 1800; diff --git a/keama/tests/bintadx6.out b/keama/tests/bintadx6.out index 427676c0..999e3602 100644 --- a/keama/tests/bintadx6.out +++ b/keama/tests/bintadx6.out @@ -1,6 +1,6 @@ { # binary-to-ascii data expression - # authoritative is mandatory + # empty configs are not accepted by Kea "Dhcp6": { "valid-lifetime": 1800, "client-classes": [ diff --git a/keama/tests/charcasedx4.in4 b/keama/tests/charcasedx4.in4 index 00c3ccb4..dd9ba03e 100644 --- a/keama/tests/charcasedx4.in4 +++ b/keama/tests/charcasedx4.in4 @@ -1,8 +1,5 @@ # lcase/ucase data expression -# authoritative is mandatory -authoritative; - # empty configs are not accepted by Kea default-lease-time 1800; diff --git a/keama/tests/charcasedx4.out b/keama/tests/charcasedx4.out index 20518347..fcdc20d1 100644 --- a/keama/tests/charcasedx4.out +++ b/keama/tests/charcasedx4.out @@ -1,6 +1,6 @@ { # lcase/ucase data expression - # authoritative is mandatory + # empty configs are not accepted by Kea "Dhcp4": { "valid-lifetime": 1800, "client-classes": [ diff --git a/keama/tests/class4.in4 b/keama/tests/class4.in4 index 75ec0057..f573a02c 100644 --- a/keama/tests/class4.in4 +++ b/keama/tests/class4.in4 @@ -1,8 +1,5 @@ # class declaration config -# authoritative is mandatory -authoritative; - # options option mysystem code 250 = text; option myversion code 251 = unsigned integer 16; diff --git a/keama/tests/class4.out b/keama/tests/class4.out index b1b4f37b..41ddf27f 100644 --- a/keama/tests/class4.out +++ b/keama/tests/class4.out @@ -1,9 +1,8 @@ { # class declaration config - # authoritative is mandatory + # options "Dhcp4": { "option-def": [ - # options { "space": "dhcp4", "name": "mysystem", diff --git a/keama/tests/class4empty.in4 b/keama/tests/class4empty.in4 index d56984be..d0b9faa5 100644 --- a/keama/tests/class4empty.in4 +++ b/keama/tests/class4empty.in4 @@ -1,8 +1,5 @@ # void class declaration config -# authoritative is mandatory -authoritative; - # class declaration class "foobar" { } diff --git a/keama/tests/class4empty.out b/keama/tests/class4empty.out index ad44aefc..d2359856 100644 --- a/keama/tests/class4empty.out +++ b/keama/tests/class4empty.out @@ -1,9 +1,8 @@ { # void class declaration config - # authoritative is mandatory + # class declaration "Dhcp4": { "client-classes": [ - # class declaration { "name": "foobar" } diff --git a/keama/tests/class6.in6 b/keama/tests/class6.in6 index 0052642c..039a80c9 100644 --- a/keama/tests/class6.in6 +++ b/keama/tests/class6.in6 @@ -1,8 +1,5 @@ # class declaration config -# authoritative is mandatory -authoritative; - # options option dhcp6.mysystem code 1250 = text; option dhcp6.myversion code 1251 = unsigned integer 16; diff --git a/keama/tests/class6.out b/keama/tests/class6.out index 2f66346c..8c9af83d 100644 --- a/keama/tests/class6.out +++ b/keama/tests/class6.out @@ -1,9 +1,8 @@ { # class declaration config - # authoritative is mandatory + # options "Dhcp6": { "option-def": [ - # options { "space": "dhcp6", "name": "mysystem", diff --git a/keama/tests/class6empty.in6 b/keama/tests/class6empty.in6 index d56984be..d0b9faa5 100644 --- a/keama/tests/class6empty.in6 +++ b/keama/tests/class6empty.in6 @@ -1,8 +1,5 @@ # void class declaration config -# authoritative is mandatory -authoritative; - # class declaration class "foobar" { } diff --git a/keama/tests/class6empty.out b/keama/tests/class6empty.out index 36f6a70e..a9869b5f 100644 --- a/keama/tests/class6empty.out +++ b/keama/tests/class6empty.out @@ -1,9 +1,8 @@ { # void class declaration config - # authoritative is mandatory + # class declaration "Dhcp6": { "client-classes": [ - # class declaration { "name": "foobar" } diff --git a/keama/tests/classbadmatch.err b/keama/tests/classbadmatch.err index 74768a6b..b9eac948 100644 --- a/keama/tests/classbadmatch.err +++ b/keama/tests/classbadmatch.err @@ -1,8 +1,5 @@ # bad (match with a boolean expression) class declaration config -# authoritative is mandatory -authoritative; - # class declaration class "foobar" { match option server.duplicates = 0; diff --git a/keama/tests/classbadmatch.msg b/keama/tests/classbadmatch.msg index 73f6ce7e..5fcda249 100644 --- a/keama/tests/classbadmatch.msg +++ b/keama/tests/classbadmatch.msg @@ -1 +1 @@ -classbadmatch.err line 8: Expecting a data expression. +classbadmatch.err line 5: Expecting a data expression. diff --git a/keama/tests/classbadmatchif.err b/keama/tests/classbadmatchif.err index 1949c994..7eb88d65 100644 --- a/keama/tests/classbadmatchif.err +++ b/keama/tests/classbadmatchif.err @@ -1,8 +1,5 @@ # bad (match if with a data expression) class declaration config -# authoritative is mandatory -authoritative; - # class declaration class "foobar" { match if option server.duplicates; diff --git a/keama/tests/classbadmatchif.msg b/keama/tests/classbadmatchif.msg index 79da9e24..073d48c2 100644 --- a/keama/tests/classbadmatchif.msg +++ b/keama/tests/classbadmatchif.msg @@ -1 +1 @@ -classbadmatchif.err line 8: Expecting a boolean expression. +classbadmatchif.err line 5: Expecting a boolean expression. diff --git a/keama/tests/concatdx4.in4 b/keama/tests/concatdx4.in4 index 6f21f36d..b94a3a2f 100644 --- a/keama/tests/concatdx4.in4 +++ b/keama/tests/concatdx4.in4 @@ -1,8 +1,5 @@ # concat data expression -# authoritative is mandatory -authoritative; - # empty configs are not accepted by Kea default-lease-time 1800; diff --git a/keama/tests/concatdx4.out b/keama/tests/concatdx4.out index 7b76dfbf..4602a497 100644 --- a/keama/tests/concatdx4.out +++ b/keama/tests/concatdx4.out @@ -1,6 +1,6 @@ { # concat data expression - # authoritative is mandatory + # empty configs are not accepted by Kea "Dhcp4": { "valid-lifetime": 1800, "client-classes": [ diff --git a/keama/tests/concatnulldx4.in4 b/keama/tests/concatnulldx4.in4 index ffd41e90..9b5e2a42 100644 --- a/keama/tests/concatnulldx4.in4 +++ b/keama/tests/concatnulldx4.in4 @@ -1,8 +1,5 @@ # concat with null argument data expression -# authoritative is mandatory -authoritative; - # empty configs are not accepted by Kea default-lease-time 1800; diff --git a/keama/tests/concatnulldx4.out b/keama/tests/concatnulldx4.out index 3248b46f..66cdbdf8 100644 --- a/keama/tests/concatnulldx4.out +++ b/keama/tests/concatnulldx4.out @@ -1,6 +1,6 @@ { # concat with null argument data expression - # authoritative is mandatory + # empty configs are not accepted by Kea "Dhcp4": { "valid-lifetime": 1800, "client-classes": [ diff --git a/keama/tests/configdata4.in4 b/keama/tests/configdata4.in4 index 36d9755e..f8c5c7bc 100644 --- a/keama/tests/configdata4.in4 +++ b/keama/tests/configdata4.in4 @@ -1,8 +1,5 @@ # config (aka server option space data config -# authoritative is mandatory -authoritative; - # empty configs are not accepted by Kea default-lease-time 1800; diff --git a/keama/tests/configdata4.out b/keama/tests/configdata4.out index a5ee46c7..a1af336e 100644 --- a/keama/tests/configdata4.out +++ b/keama/tests/configdata4.out @@ -1,6 +1,6 @@ { # config (aka server option space data config - # authoritative is mandatory + # empty configs are not accepted by Kea "Dhcp4": { "valid-lifetime": 1800 // "config": [ diff --git a/keama/tests/czb/kea.json b/keama/tests/czb/kea.json index 0c881832..f615fd88 100644 --- a/keama/tests/czb/kea.json +++ b/keama/tests/czb/kea.json @@ -2,6 +2,7 @@ /// This configuration declares some subnets but has no interfaces-config /// Reference Kea #245 "Dhcp4": { + "authoritative": true, // "statement": { // "eval": { // "variable-reference": "ddns-const-dhcid" diff --git a/keama/tests/dbtimeformat4.in4 b/keama/tests/dbtimeformat4.in4 index 74f8c62f..b3225a82 100644 --- a/keama/tests/dbtimeformat4.in4 +++ b/keama/tests/dbtimeformat4.in4 @@ -1,8 +1,5 @@ # db-time-format config -# authoritative is mandatory -authoritative; - # empty configs are not accepted by Kea default-lease-time 1800; diff --git a/keama/tests/dbtimeformat4.out b/keama/tests/dbtimeformat4.out index 2e59d154..0988bfbd 100644 --- a/keama/tests/dbtimeformat4.out +++ b/keama/tests/dbtimeformat4.out @@ -1,6 +1,6 @@ { # db-time-format config - # authoritative is mandatory + # empty configs are not accepted by Kea "Dhcp4": { "valid-lifetime": 1800 // "statement": { diff --git a/keama/tests/dbtimeformat6.in6 b/keama/tests/dbtimeformat6.in6 index d1327662..619d1c91 100644 --- a/keama/tests/dbtimeformat6.in6 +++ b/keama/tests/dbtimeformat6.in6 @@ -1,8 +1,5 @@ # db-time-format config -# authoritative is mandatory -authoritative; - # empty configs are not accepted by Kea default-lease-time 1800; diff --git a/keama/tests/dbtimeformat6.out b/keama/tests/dbtimeformat6.out index 2fbd85b4..42460de6 100644 --- a/keama/tests/dbtimeformat6.out +++ b/keama/tests/dbtimeformat6.out @@ -1,6 +1,6 @@ { # db-time-format config - # authoritative is mandatory + # empty configs are not accepted by Kea "Dhcp6": { "valid-lifetime": 1800 // "statement": { diff --git a/keama/tests/ddnsupdstyle6.in6 b/keama/tests/ddnsupdstyle6.in6 index fc7903ee..ef23fe38 100644 --- a/keama/tests/ddnsupdstyle6.in6 +++ b/keama/tests/ddnsupdstyle6.in6 @@ -1,8 +1,5 @@ # ddns-update-style -# authoritative is mandatory -authoritative; - ddns-update-style standard; # embedded in pool diff --git a/keama/tests/ddnsupdstyle6.out b/keama/tests/ddnsupdstyle6.out index 1be8eace..88323bb0 100644 --- a/keama/tests/ddnsupdstyle6.out +++ b/keama/tests/ddnsupdstyle6.out @@ -1,6 +1,5 @@ { # ddns-update-style - # authoritative is mandatory /// This configuration declares some subnets but has no interfaces-config /// Reference Kea #245 "Dhcp6": { diff --git a/keama/tests/defaultexpr6.in6 b/keama/tests/defaultexpr6.in6 index f395dd9f..e81bd8d3 100644 --- a/keama/tests/defaultexpr6.in6 +++ b/keama/tests/defaultexpr6.in6 @@ -1,8 +1,5 @@ # default expressions -# authoritative is mandatory -authoritative; - # empty configs are not accepted by Kea default-lease-time 1800; diff --git a/keama/tests/defaultexpr6.out b/keama/tests/defaultexpr6.out index 0208f49a..8646e8af 100644 --- a/keama/tests/defaultexpr6.out +++ b/keama/tests/defaultexpr6.out @@ -1,6 +1,6 @@ { # default expressions - # authoritative is mandatory + # empty configs are not accepted by Kea "Dhcp6": { "valid-lifetime": 1800 // # default expression is a variable reference diff --git a/keama/tests/denyunknown6.in6 b/keama/tests/denyunknown6.in6 index 54599cf9..ccd5541a 100644 --- a/keama/tests/denyunknown6.in6 +++ b/keama/tests/denyunknown6.in6 @@ -1,8 +1,5 @@ # DHCPv6 deny unknown client config -# authoritative is mandatory -authoritative; - # empty configs are not accepted by Kea default-lease-time 1800; diff --git a/keama/tests/denyunknown6.out b/keama/tests/denyunknown6.out index 76798b0d..68db27b7 100644 --- a/keama/tests/denyunknown6.out +++ b/keama/tests/denyunknown6.out @@ -1,6 +1,6 @@ { # DHCPv6 deny unknown client config - # authoritative is mandatory + # empty configs are not accepted by Kea /// This configuration declares some subnets but has no interfaces-config /// Reference Kea #245 "Dhcp6": { diff --git a/keama/tests/dhcp3/common.dhcpd b/keama/tests/dhcp3/common.dhcpd index 65b706d1..4c55c838 100644 --- a/keama/tests/dhcp3/common.dhcpd +++ b/keama/tests/dhcp3/common.dhcpd @@ -22,7 +22,7 @@ set vendor-string = option vendor-class-identifier; # Authoritation is defined at the network level for each shared network -#not authoritative; +not authoritative; include "dhcp3/events.dhcpd"; diff --git a/keama/tests/dhcp3/common.dhcpd.orig b/keama/tests/dhcp3/common.dhcpd.orig deleted file mode 100644 index 4c55c838..00000000 --- a/keama/tests/dhcp3/common.dhcpd.orig +++ /dev/null @@ -1,120 +0,0 @@ -# NATIONAL DHCPD Master Configuration File -# 2010-12-14 ~bpeterson -# -# All non-unique DHCP configuration to be placed here. -# ! ! -# ! CAUTION ! -# ! ! -# All dhcp configuration files are handled by cfengine at -# meles.srv.pavlovmedia.corp -# Non-unique configuration is contained in dhcp3/folder.dhcpd/master.dhcpd -# Individual dhcp scopes are defined by sitecode as shared networks in -# dhcp3/folder.dhcpd/$SITECODE.dhcpd -# Files are included into the dhcpd.conf with include statements in -# dhcp3/includes.dhcpd - -# Define DHCPD logging to its own facility -log-facility local0; - - -# So that the vendor-class-identifier shows in dhcpd.leases file -set vendor-string = option vendor-class-identifier; - - -# Authoritation is defined at the network level for each shared network -not authoritative; - -include "dhcp3/events.dhcpd"; - -# We are not currently implenting reverse DNS -ddns-update-style none; -ddns-updates off; - -deny duplicates; - -# OMAPI configuration -omapi-port 7911; - -key omapi_key { -algorithm HMAC-MD5; -secret "InHgN5hAa9m7eCkkPCrVBsLpmKhfWZ3L9+X8pLkg/uM="; -}; - -omapi-key omapi_key; - -# Default lease times can be over-ridden at the network or subnet level -## CHEAT SHEET ##### -# 8 hours = 28800 # -# 7 hours = 25200 # -# 6 hours = 21600 # -# 5 hours = 14400 # -# 4 hours = 10800 # -# 2 hours = 7200 # -# 1 hour = 3600 # -#################### - -# Changelog: -# ---------- -# 08/22/13 - rsaska: set to 14,400 (4 hours) -default-lease-time 14400; -max-lease-time 14400; -min-lease-time 3600; - -# Define option 43 for Ruckus devices as text -option space VendorInfo; -option VendorInfo.acsurl code 1 = text; - -# Define option 43 for UniFi -option space ubnt; -option ubnt.unifi-address code 1 = ip-address; - -# Define device classes -class "cm-unregistered" { - match if substring (option vendor-class-identifier, 0, 6) = "docsis"; - } - -class "ruckus" { - match if ( option vendor-class-identifier = "Ruckus CPE" ) or ( option vendor-class-identifier = "Ruckus" ); - vendor-option-space VendorInfo; - option VendorInfo.acsurl "http://172.25.207.18/intune/server"; - } - -class "Trapeze" { - match if option vendor-class-identifier = "WIRELESS-AP:MP_522"; - } -class "Trapeze2" { - match if option vendor-class-identifier = "WIRELESS-AP:WLA522-US"; - } - -class "ubnt" { - match if ( option vendor-class-identifier = "ubnt" ) or ( option vendor-class-identifier = "udhcp 1.11.2" ); - option vendor-class-identifier "ubnt"; - vendor-option-space ubnt; - option ubnt.unifi-address 66.253.253.32; -} - -class "unifi" { - match if option vendor-class-identifier = "udhcp 1.11.2"; - option ubnt.unifi-address 66.253.253.32; - } - -class "3010s" { - match if ((substring(option host-name,0,10) = "DES-3010PA")); - } - -class "HP" { - match if option vendor-class-identifier = "Colubris-AP"; -} - -class "BEC" { - match if ( substring(hardware,1,3) = 00:04:ED ); -} - - -# Include includes file with individual site configuration files -# also includes everything from dhcp_hosts at this level. -include "dhcp3/includes.dhcpd"; - -# Include configurations for CMTS sites -include "dhcp3/cmts/sites/includes.dhcpd"; - diff --git a/keama/tests/dhcp3/kea.json b/keama/tests/dhcp3/kea.json index 42f99cfe..6c5d7e22 100644 --- a/keama/tests/dhcp3/kea.json +++ b/keama/tests/dhcp3/kea.json @@ -104,7 +104,8 @@ /// dynamic-bootp-client is not supported by Kea "client-class": "gen#_AND_#!ruckus#!ubnt#" } - ] + ], + "authoritative": true }, # include "/etc/dhcp3/folder.dhcpd/events.dhcpd"; { @@ -179,7 +180,8 @@ /// dynamic-bootp-client is not supported by Kea "client-class": "gen#_AND_#!ruckus#!ubnt#" } - ] + ], + "authoritative": true }, # include "/etc/dhcp3/folder.dhcpd/events.dhcpd"; # WANIP for ilchbat not configured @@ -248,7 +250,8 @@ /// dynamic-bootp-client is not supported by Kea "client-class": "gen#_AND_#!ruckus#!ubnt#" } - ] + ], + "authoritative": true }, # include "/etc/dhcp3/folder.dhcpd/events.dhcpd"; # WANIP for ilchept not configured @@ -317,7 +320,8 @@ /// dynamic-bootp-client is not supported by Kea "client-class": "gen#_AND_#!ruckus#!ubnt#" } - ] + ], + "authoritative": true }, # include "/etc/dhcp3/folder.dhcpd/events.dhcpd"; # WANIP for ilcucss_lrevdsl not configured @@ -401,7 +405,8 @@ "hw-address": "00:1e:67:a3:68:bf", "ip-address": "66.253.181.103" } - ] + ], + "authoritative": true }, # include "/etc/dhcp3/folder.dhcpd/events.dhcpd"; # WANIP for ilcudow-free not configured @@ -470,7 +475,8 @@ /// dynamic-bootp-client is not supported by Kea "client-class": "gen#_AND_#!ruckus#!ubnt#" } - ] + ], + "authoritative": true }, # include "/etc/dhcp3/folder.dhcpd/events.dhcpd"; # WANIP for ilcudow-paid not configured @@ -539,7 +545,8 @@ /// dynamic-bootp-client is not supported by Kea "client-class": "gen#_AND_#!ruckus#!ubnt#" } - ] + ], + "authoritative": true }, # include "/etc/dhcp3/folder.dhcpd/events.dhcpd"; # WANIP for ilurtrb not configured @@ -608,7 +615,8 @@ /// dynamic-bootp-client is not supported by Kea "client-class": "gen#_AND_#!ruckus#!ubnt#" } - ] + ], + "authoritative": true }, # include "/etc/dhcp3/folder.dhcpd/events.dhcpd"; # WANIP for njsetra not configured @@ -691,7 +699,8 @@ "hw-address": "c0:c5:20:27:d5:00", "ip-address": "66.253.131.61" } - ] + ], + "authoritative": true }, # include "/etc/dhcp3/folder.dhcpd/events.dhcpd"; # WANIP for njwehen not configured @@ -760,7 +769,8 @@ /// dynamic-bootp-client is not supported by Kea "client-class": "gen#_AND_#!ruckus#!ubnt#" } - ] + ], + "authoritative": true } ], "host-reservation-identifiers": [ @@ -822,6 +832,8 @@ // } // } // }, + # Authoritation is defined at the network level for each shared network + "authoritative": false, "dhcp-ddns": { "enable-updates": false }, @@ -1246,7 +1258,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/albipie.dhcpd # albipie DHCPD Config File. @@ -1443,7 +1456,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/aljajac.dhcpd # aljajac DHCPD Config File. @@ -1580,7 +1594,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/altrgro.dhcpd # altrgro DHCPD Config File. @@ -1742,7 +1757,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/altrtro.dhcpd # altrtro DHCPD Config File. @@ -1932,7 +1948,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/arfahpl.dhcpd # arfahpl DHCPD Config File. @@ -2072,7 +2089,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/arjogro.dhcpd # arjogro DHCPD Config File. @@ -2223,7 +2241,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/azchave.dhcpd # azchave DHCPD Config File. @@ -6479,7 +6498,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/azsursv.dhcpd # azsursv DHCPD Config File. @@ -6602,7 +6622,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/aztecom.dhcpd # aztecom DHCPD Config File. @@ -6733,7 +6754,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/aztecsr.dhcpd # aztecsr DHCPD Config File. @@ -6864,7 +6886,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/aztedis.dhcpd # aztedis DHCPD Config File. @@ -7079,7 +7102,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/aztegmo.dhcpd # aztegmo DHCPD Config File. @@ -7344,7 +7368,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/aztevds.dhcpd # aztevds DHCPD Config File. @@ -7769,7 +7794,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/aztevil.dhcpd # aztevil DHCPD Config File. @@ -8025,7 +8051,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/aztuert.dhcpd # aztuert DHCPD Config File. @@ -8148,7 +8175,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/aztueru.dhcpd # aztueru DHCPD Config File. @@ -8271,7 +8299,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/aztunpt.dhcpd # aztunpt DHCPD Config File. @@ -8600,7 +8629,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/aztures.dhcpd # aztures DHCPD Config File. @@ -8941,7 +8971,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/cafrjco.dhcpd # cafrjco DHCPD Config File. @@ -9206,7 +9237,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/cagotro.dhcpd # cagotro DHCPD Config File. @@ -9341,7 +9373,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/casaver.dhcpd # casaver DHCPD Config File. @@ -9616,7 +9649,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/casdgra.dhcpd # casdgra DHCPD Config File. @@ -9757,7 +9791,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/cobouva.dhcpd # cobouva DHCPD Config File. @@ -9964,7 +9999,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/cofcgro.dhcpd # cofcgro DHCPD Config File. @@ -10104,7 +10140,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/flgamel.dhcpd # flgamel DHCPD Config File. @@ -10241,7 +10278,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/fljamel.dhcpd # fljamel DHCPD Config File. @@ -10371,7 +10409,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/floredg.dhcpd # floredg DHCPD Config File. @@ -10646,7 +10685,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/florlof.dhcpd # florlof DHCPD Config File. @@ -10766,7 +10806,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/fltacam.dhcpd # fltacam DHCPD Config File. @@ -13850,7 +13891,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/fltagnd.dhcpd # fltagnd DHCPD Config File. @@ -14114,7 +14156,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/fltalux.dhcpd # fltalux DHCPD Config File. @@ -14254,7 +14297,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/fltavth.dhcpd # fltavth DHCPD Config File. @@ -14363,7 +14407,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/fltbhla.dhcpd # fltbhla DHCPD Config File. @@ -14486,7 +14531,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/gaanriv.dhcpd # gaanriv DHCPD Config File. @@ -14612,7 +14658,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/gadusav.dhcpd # gadusav DHCPD Config File. @@ -14735,7 +14782,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/gahicol.dhcpd # gahicol DHCPD Config File. @@ -14850,7 +14898,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/gakeucf.dhcpd # gakeucf DHCPD Config File. @@ -15124,7 +15173,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/gamamac.dhcpd # gamamac DHCPD Config File. @@ -15255,7 +15305,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/gamibel.dhcpd # gamibel DHCPD Config File. @@ -15386,7 +15437,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/gasmspg.dhcpd # gasmspg DHCPD Config File. @@ -15509,7 +15561,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/gaststa.dhcpd # gaststa DHCPD Config File. @@ -15639,7 +15692,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/gastupi.dhcpd # gastupi DHCPD Config File. @@ -15829,7 +15883,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/ilcapsi.dhcpd # ilcapsi DHCPD Config File. @@ -15940,7 +15995,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/ilcu1001clrk.dhcpd # ilcu1001clrk DHCPD Config File. @@ -16039,7 +16095,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/ilcu1004sloc.dhcpd # ilcu1004sloc DHCPD Config File. @@ -16154,7 +16211,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/ilcu1004sto.dhcpd # ilcu1004sto DHCPD Config File. @@ -16253,7 +16311,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/ilcu1005sec.dhcpd # ilcu1005sec DHCPD Config File. @@ -16352,7 +16411,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/ilcu1006sthi.dhcpd # ilcu1006sthi DHCPD Config File. @@ -16467,7 +16527,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/ilcu1006sto.dhcpd # ilcu1006sto DHCPD Config File. @@ -16582,7 +16643,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/ilcu1007sfir.dhcpd # ilcu1007sfir DHCPD Config File. @@ -16681,7 +16743,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/ilcu1009wcla.dhcpd # ilcu1009wcla DHCPD Config File. @@ -16800,7 +16863,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/ilcu1010wcla.dhcpd # ilcu1010wcla DHCPD Config File. @@ -16915,7 +16979,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/ilcu1012wcla.dhcpd # ilcu1012wcla DHCPD Config File. @@ -17097,7 +17162,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/ilcu102greg.dhcpd # ilcu102greg DHCPD Config File. @@ -17205,7 +17271,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/ilcu103s.dhcpd # ilcu103s DHCPD Config File. @@ -17387,7 +17454,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/ilcu104earm.dhcpd # ilcu104earm DHCPD Config File. @@ -17486,7 +17554,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/ilcu105edan.dhcpd # ilcu105edan DHCPD Config File. @@ -17601,7 +17670,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/ilcu105egrn.dhcpd # ilcu106egrn DHCPD Config File. @@ -17783,7 +17853,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/ilcu105four.dhcpd # ilcu105four DHCPD Config File. @@ -17882,7 +17953,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/ilcu105john.dhcpd # ilcu105john DHCPD Config File. @@ -17981,7 +18053,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/ilcu106dan.dhcpd # ilcu106dan DHCPD Config File. @@ -18163,7 +18236,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/ilcu108chl.dhcpd # ilcu108chl DHCPD Config File. @@ -18261,7 +18335,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/ilcu1103euc.dhcpd # ilcu1103euc DHCPD Config File. @@ -18360,7 +18435,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/ilcu1106sto.dhcpd # ilcu1106sto DHCPD Config File. @@ -18459,7 +18535,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/ilcu11074th.dhcpd # ilcu11074th DHCPD Config File. @@ -18574,7 +18651,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/ilcu1107ssec.dhcpd # ilcu1107ssec DHCPD Config File. @@ -18689,7 +18767,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/ilcu1109sto.dhcpd # ilcu1109sto DHCPD Config File. @@ -18788,7 +18867,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/ilcu110ejohn.dhcpd # ilcu110ejohn DHCPD Config File. @@ -18970,7 +19050,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/ilcu1112sec.dhcpd # ilcu1112sec DHCPD Config File. @@ -19069,7 +19150,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/ilcu111echa.dhcpd # ilcu111echa DHCPD Config File. @@ -19184,7 +19266,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/ilcu111eh.dhcpd # ilcu111eh DHCPD Config File. @@ -19299,7 +19382,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/ilcu201arm.dhcpd # ilcu201arm DHCPD Config File. @@ -19398,7 +19482,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/ilcu202john.dhcpd # ilcu202john DHCPD Config File. @@ -19513,7 +19598,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/ilcu203hea.dhcpd # ilcu203hea DHCPD Config File. @@ -19628,7 +19714,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/ilcu203s6th.dhcpd # ilcu203s6th DHCPD Config File. @@ -19810,7 +19897,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/ilcu208nha.dhcpd # ilcu208nha DHCPD Config File. @@ -19909,7 +19997,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/ilcu208whi.dhcpd # ilcu208whi DHCPD Config File. @@ -20008,7 +20097,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/ilcu209clar.dhcpd # ilcu209clar DHCPD Config File. @@ -20107,7 +20197,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/ilcu210whi.dhcpd # ilcu210whi DHCPD Config File. @@ -20206,7 +20297,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/ilcu211clark.dhcpd # ilcu211clark DHCPD Config File. @@ -20305,7 +20397,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/ilcu211john.dhcpd # ilcu211john DHCPD Config File. @@ -20404,7 +20497,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/ilcu3024th.dhcpd # ilcu3024th DHCPD Config File. @@ -20586,7 +20680,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/ilcu303egrn.dhcpd # ilcu303egrn DHCPD Config File. @@ -20684,7 +20779,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/ilcu303sbus.dhcpd # ilcu303sbus DHCPD Config File. @@ -20783,7 +20879,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/ilcu303wgrn.dhcpd # ilcu303wgrn DHCPD Config File. @@ -20898,7 +20995,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/ilcu306arm.dhcpd # ilcu306arm DHCPD Config File. @@ -20997,7 +21095,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/ilcu306clrk.dhcpd # ilcu306clrk DHCPD Config File. @@ -21096,7 +21195,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/ilcu306whit.dhcpd # ilcu306whit DHCPD Config File. @@ -21195,7 +21295,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/ilcu307arm.dhcpd # ilcu307arm DHCPD Config File. @@ -21310,7 +21411,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/ilcu307clk.dhcpd # ilcu307clk DHCPD Config File. @@ -21425,7 +21527,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/ilcu307egre.dhcpd # ilcu307egre DHCPD Config File. @@ -21524,7 +21627,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/ilcu307white.dhcpd # ilcu307white DHCPD Config File. @@ -21657,7 +21761,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/ilcu308earm.dhcpd # ilcu308earm DHCPD Config File. @@ -21756,7 +21861,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/ilcu308whit.dhcpd # ilcu308whit DHCPD Config File. @@ -21855,7 +21961,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/ilcu309cla.dhcpd # ilcu309cla DHCPD Config File. @@ -21970,7 +22077,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/ilcu309egrn.dhcpd # ilcu309egrn DHCPD Config File. @@ -22124,7 +22232,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/ilcu309heal.dhcpd # ilcu309heal DHCPD Config File. @@ -22239,7 +22348,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/ilcu309s1st.dhcpd # ilcu309s1st DHCPD Config File. @@ -22338,7 +22448,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/ilcu309white.dhcpd # ilcu309white DHCPD Config File. @@ -22445,7 +22556,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/ilcu310clar.dhcpd # ilcu310clar DHCPD Config File. @@ -22544,7 +22656,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/ilcu310whi.dhcpd # ilcu310whi DHCPD Config File. @@ -22643,7 +22756,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/ilcu311white.dhcpd # ilcu311white DHCPD Config File. @@ -22742,7 +22856,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/ilcu312whit.dhcpd # ilcu312whit DHCPD Config File. @@ -22841,7 +22956,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/ilcu3rd.dhcpd # ilcu3rd DHCPD Config File. @@ -23110,7 +23226,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/ilcu403grn.dhcpd # ilcu403grn DHCPD Config File. @@ -23209,7 +23326,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/ilcu403whit.dhcpd # ilcu403whit DHCPD Config File. @@ -23308,7 +23426,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/ilcu405whit.dhcpd # ilcu405whit DHCPD Config File. @@ -23423,7 +23542,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/ilcu406grn.dhcpd # ilcu406grn DHCPD Config File. @@ -23538,7 +23658,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/ilcu408grn.dhcpd # ilcu408grn DHCPD Config File. @@ -23637,7 +23758,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/ilcu410grn.dhcpd # ilcu410grn DHCPD Config File. @@ -23766,7 +23888,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/ilcu411heal.dhcpd # ilcu411heal DHCPD Config File. @@ -23898,7 +24021,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/ilcu501heal.dhcpd # ilcu501heal DHCPD Config File. @@ -23997,7 +24121,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/ilcu502heal.dhcpd # ilcu502heal DHCPD Config File. @@ -24096,7 +24221,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/ilcu503whi.dhcpd # ilcu503whi DHCPD Config File. @@ -24195,7 +24321,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/ilcu5054th.dhcpd # ilcu5054th DHCPD Config File. @@ -24310,7 +24437,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/ilcu505buse.dhcpd # ilcu505buse DHCPD Config File. @@ -24429,7 +24557,8 @@ "id": 409, "subnet": "96.63.204.76/32" } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/ilcu505heal.dhcpd # ilcu505heal DHCPD Config File. @@ -24528,7 +24657,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/ilcu505whi.dhcpd # ilcu505whi DHCPD Config File. @@ -24643,7 +24773,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/ilcu506st.dhcpd # ilcu506st DHCPD Config File. @@ -24742,7 +24873,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/ilcu507wchu.dhcpd # ilcu507wchu DHCPD Config File. @@ -24857,7 +24989,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/ilcu508clrk.dhcpd # ilcu508clrk DHCPD Config File. @@ -24972,7 +25105,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/ilcu508ew.dhcpd # ilcu508ew DHCPD Config File. @@ -25087,7 +25221,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/ilcu508heal.dhcpd # ilcu508heal DHCPD Config File. @@ -25220,7 +25355,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/ilcu508sfir.dhcpd # ilcu508sfir DHCPD Config File. @@ -25335,7 +25471,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/ilcu5095th.dhcpd # ilcu5095th DHCPD Config File. @@ -25434,7 +25571,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/ilcu509bash.dhcpd # ilcu509bash DHCPD Config File. @@ -25533,7 +25671,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/ilcu509clk.dhcpd # ilcu509clk DHCPD Config File. @@ -25632,7 +25771,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/ilcu509stou.dhcpd # ilcu509stou DHCPD Config File. @@ -25731,7 +25871,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/ilcu509whi.dhcpd # ilcu509whi DHCPD Config File. @@ -25830,7 +25971,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/ilcu510clrk.dhcpd # ilcu510clrk DHCPD Config File. @@ -25929,7 +26071,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/ilcu510esto.dhcpd # ilcu510esto DHCPD Config File. @@ -26028,7 +26171,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/ilcu511wchu.dhcpd # ilcu511wchu DHCPD Config File. @@ -26143,7 +26287,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/ilcu512sto.dhcpd # ilcu512sto DHCPD Config File. @@ -26258,7 +26403,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/ilcu52g.dhcpd # ilcu52g DHCPD Config File. @@ -26373,7 +26519,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/ilcu55heal.dhcpd # ilcu55heal DHCPD Config File. @@ -26488,7 +26635,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/ilcu565egre.dhcpd # ilcu565egre DHCPD Config File. @@ -26587,7 +26735,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/ilcu585gre.dhcpd # ilcu585gre DHCPD Config File. @@ -26686,7 +26835,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/ilcu58earm.dhcpd # ilcu58earm DHCPD Config File. @@ -26868,7 +27018,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/ilcu58gre.dhcpd # ilcu58gre DHCPD Config File. @@ -26967,7 +27118,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/ilcu58john.dhcpd # ilcu58john DHCPD Config File. @@ -27066,7 +27218,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/ilcu5st.dhcpd # ilcu5st DHCPD Config File. @@ -27181,7 +27334,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/ilcu601clark.dhcpd # ilcu601clark DHCPD Config File. @@ -27314,7 +27468,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/ilcu602s.dhcpd # ilcu602s DHCPD Config File. @@ -27429,7 +27584,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/ilcu603eclark.dhcpd # ilcu603eclark DHCPD Config File. @@ -27528,7 +27684,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/ilcu604whi.dhcpd # ilcu604whi DHCPD Config File. @@ -27643,7 +27800,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/ilcu604wsto.dhcpd # ilcu604wsto DHCPD Config File. @@ -27758,7 +27916,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/ilcu605fifth.dhcpd # ilcu605fifth DHCPD Config File. @@ -27857,7 +28016,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/ilcu605sfir.dhcpd # ilcu605sfir DHCPD Config File. @@ -27956,7 +28116,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/ilcu607s1.dhcpd # ilcu607s1 DHCPD Config File. @@ -28055,7 +28216,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/ilcu608stat.dhcpd # ilcu608stat DHCPD Config File. @@ -28154,7 +28316,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/ilcu609wmai.dhcpd # ilcu609wmai DHCPD Config File. @@ -28269,7 +28432,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/ilcu621grn.dhcpd # ilcu621grn DHCPD Config File. @@ -28368,7 +28532,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/ilcu701wel.dhcpd # ilcu701wel DHCPD Config File. @@ -28467,7 +28632,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/ilcu705wel.dhcpd # ilcu705wel DHCPD Config File. @@ -28582,7 +28748,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/ilcu706sfir.dhcpd # ilcu706sfir DHCPD Config File. @@ -28697,7 +28864,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/ilcu711elm.dhcpd # ilcu711elm DHCPD Config File. @@ -28796,7 +28964,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/ilcu713ran.dhcpd # ilcu713ran DHCPD Config File. @@ -28895,7 +29064,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/ilcu713s6.dhcpd # ilcu713s6 DHCPD Config File. @@ -28994,7 +29164,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/ilcu802wgre.dhcpd # ilcu802wgre DHCPD Config File. @@ -29093,7 +29264,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/ilcu8054th.dhcpd # ilcu8054th DHCPD Config File. @@ -29192,7 +29364,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/ilcu807ill.dhcpd # ilcu807ill DHCPD Config File. @@ -29291,7 +29464,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/ilcu905locust.dhcpd # ilcu905locust DHCPD Config File. @@ -29390,7 +29564,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/ilcu907wsto.dhcpd # ilcu907wsto DHCPD Config File. @@ -29489,7 +29664,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/ilcub310.dhcpd # ilcub310 DHCPD Config File. @@ -33145,7 +33321,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/ilcudg.dhcpd # ilcudg DHCPD Config File. @@ -33243,7 +33420,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/ilcugrg.dhcpd # ilcugrg DHCPD Config File. @@ -33350,7 +33528,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/ilcuito.dhcpd # ilcuito DHCPD Config File. @@ -33511,7 +33690,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/ilcul54.dhcpd # ilcul54 DHCPD Config File. @@ -33659,7 +33839,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/ilcun3c.dhcpd # ilcun3c DHCPD Config File. @@ -33763,7 +33944,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/ilcunoc.dhcpd # ilcunoc DHCPD Config File. @@ -33960,7 +34142,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/ilcupre.dhcpd # ilcupre DHCPD Config File. @@ -34722,7 +34905,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/ilcusredelmar.dhcpd # ilcusredelmar DHCPD Config File. @@ -34784,7 +34968,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/ilcuzas.dhcpd # ilcuzas DHCPD Config File. @@ -34899,7 +35084,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/iledenc.dhcpd # iledenc DHCPD Config File. @@ -35062,7 +35248,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/iledenw.dhcpd # iledenw DHCPD Config File. @@ -35269,7 +35456,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/ilnojun.dhcpd # ilnojun DHCPD Config File. @@ -35392,7 +35580,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/ilur106scol.dhcpd # ilur106scol DHCPD Config File. @@ -35527,7 +35716,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/ilur701greg.dhcpd # ilur701greg DHCPD Config File. @@ -35642,7 +35832,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/ilur805wg.dhcpd # ilur805wg DHCPD Config File. @@ -35757,7 +35948,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/ilurcco.dhcpd # ilurcco DHCPD Config File. @@ -35899,7 +36091,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/ilurmt6.dhcpd # ilurmt6 DHCPD Config File. @@ -36013,7 +36206,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/ilurpui.dhcpd # ilurpui DHCPD Config File. @@ -36180,7 +36374,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/iluruco.dhcpd # iluruco DHCPD Config File. @@ -36282,7 +36477,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/inblbra.dhcpd # inblbra DHCPD Config File. @@ -36421,7 +36617,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/inbluco.dhcpd # inbluco DHCPD Config File. @@ -36552,7 +36749,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/infwspl.dhcpd # infwspl DHCPD Config File. @@ -36675,7 +36873,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/inlacsl.dhcpd # inlacsl DHCPD Config File. @@ -36914,7 +37113,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/inmugro.dhcpd # inmugro DHCPD Config File. @@ -37062,7 +37262,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/inmuvil.dhcpd # inmuvil DHCPD Config File. @@ -37202,7 +37403,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/kslaccn.dhcpd # kslaccn DHCPD Config File. @@ -37409,7 +37611,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/kswigro.dhcpd # kswigro DHCPD Config File. @@ -37599,7 +37802,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/kybggab.dhcpd # kybggab DHCPD Config File. @@ -37800,7 +38004,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/kybgrku.dhcpd # kybgrku DHCPD Config File. @@ -38029,7 +38234,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/kybgwtn.dhcpd # kybgwtn DHCPD Config File. @@ -38227,7 +38433,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/kyletnc.dhcpd # kyletnc DHCPD Config File. @@ -38434,7 +38641,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/kylocar.dhcpd # kylocar DHCPD Config File. @@ -38649,7 +38857,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/kylogro.dhcpd # kylogro DHCPD Config File. @@ -38856,7 +39065,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/kymucsu.dhcpd # kymucsu DHCPD Config File. @@ -39131,7 +39341,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/kymumur.dhcpd # kymumur DHCPD Config File. @@ -39263,7 +39474,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/labrucr.dhcpd # labrucr DHCPD Config File. @@ -39411,7 +39623,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/labruhh.dhcpd # labruhh DHCPD Config File. @@ -39607,7 +39820,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/lalacap.dhcpd # lalacap DHCPD Config File. @@ -39804,7 +40018,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/lalauha.dhcpd # lalauha DHCPD Config File. @@ -39927,7 +40142,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/lalecma.dhcpd # lalecma DHCPD Config File. @@ -40117,7 +40333,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/mareaor.dhcpd # mareaor DHCPD Config File. @@ -40306,7 +40523,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/mdhyutc.dhcpd # mdhyutc DHCPD Config File. @@ -40429,7 +40647,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/mial48w.dhcpd # mial48w DHCPD Config File. @@ -40797,7 +41016,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/mideuam.dhcpd # mideuam DHCPD Config File. @@ -41014,7 +41234,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/mimpvbg.dhcpd # mimpvbg DHCPD Config File. @@ -41137,7 +41358,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/mnalfou.dhcpd # mnalfou DHCPD Config File. @@ -41209,7 +41431,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/mnmatsu.dhcpd # mnmatsu DHCPD Config File. @@ -41399,7 +41622,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/mnmi700.dhcpd # mnmi700 DHCPD Config File. @@ -42827,7 +43051,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/mnmimel.dhcpd # mnmimel DHCPD Config File. @@ -43025,7 +43250,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/mnro318.dhcpd # mnro318 DHCPD Config File. @@ -43153,7 +43379,8 @@ } ] } - ] + ], + "authoritative": true // "config": [ // /// min-lease-time is not supported // /// use default-lease-time instead @@ -43293,7 +43520,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/msstlap.dhcpd # msstlap DHCPD Config File. @@ -43415,7 +43643,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/msstmsu.dhcpd # msstmsu DHCPD Config File. @@ -43780,7 +44009,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/ncbocob.dhcpd # ncbocob DHCPD Config File. @@ -43928,7 +44158,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/ncch901.dhcpd # ncch901 DHCPD Config File. @@ -44059,7 +44290,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/ncchgto.dhcpd # ncchgto DHCPD Config File. @@ -44118,7 +44350,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/ncgrbmy.dhcpd # ncgrbmy DHCPD Config File. @@ -44345,7 +44578,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/ncgrfsp.dhcpd # ncgrfsp DHCPD Config File. @@ -44468,7 +44702,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/ncgrgro.dhcpd # ncgrgro DHCPD Config File. @@ -44600,7 +44835,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/ncgrpir.dhcpd # ncgrpir DHCPD Config File. @@ -44872,7 +45108,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/ncrattg.dhcpd # ncrattg DHCPD Config File. @@ -44987,7 +45224,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/nelivie.dhcpd # nelivie DHCPD Config File. @@ -45127,7 +45365,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/njcamer.dhcpd # njcamer DHCPD Config File. @@ -45251,7 +45490,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/njencom.dhcpd # njencom DHCPD Config File. @@ -50261,7 +50501,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/njenplo.dhcpd # njenplo DHCPD Config File. @@ -50535,7 +50776,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/njentow.dhcpd # njentow DHCPD Config File. @@ -50793,7 +51035,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/njerlta.dhcpd # njerlta DHCPD Config File. @@ -50908,7 +51151,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/njjcmar.dhcpd # njjcmar DHCPD Config File. @@ -56381,7 +56625,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/njjcmon.dhcpd # njjcmon DHCPD Config File. @@ -56504,7 +56749,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/njmo40p.dhcpd # njmo40p DHCPD Config File. @@ -56630,7 +56876,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/njmohms.dhcpd # njmohms DHCPD Config File. @@ -56761,7 +57008,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/njnyriv.dhcpd # njnyriv DHCPD Config File. @@ -56910,7 +57158,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/njrapat.dhcpd # njrapat DHCPD Config File. @@ -57025,7 +57274,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/njrarar.dhcpd # njrarar DHCPD Config File. @@ -60056,7 +60306,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/njsefra.dhcpd # njsefra DHCPD Config File. @@ -60182,7 +60433,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/njwerep.dhcpd # njwerep DHCPD Config File. @@ -60349,7 +60601,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/nvlvrpl.dhcpd # nvlvrpl DHCPD Config File. @@ -60472,7 +60725,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/nyamvor.dhcpd # nyamvor DHCPD Config File. @@ -60679,7 +60933,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/nynyclp.dhcpd # nynyclp DHCPD Config File. @@ -60802,7 +61057,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/nyropro.dhcpd # nyropro DHCPD Config File. @@ -61009,7 +61265,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/nysicsi.dhcpd # nysicsi DHCPD Config File. @@ -61157,7 +61414,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/nysycob.dhcpd # nysycob DHCPD Config File. @@ -63090,7 +63348,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/ohak401.dhcpd # ohak401 DHCPD Config File. @@ -63298,7 +63557,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/ohcinhh.dhcpd # ohcinhh DHCPD Config File. @@ -63407,7 +63667,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/ohkecpo.dhcpd # ohkecpo DHCPD Config File. @@ -63609,7 +63870,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/ohoxscr.dhcpd # ohoxscr DHCPD Config File. @@ -63883,7 +64145,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/ohtoviv.dhcpd # ohtoviv DHCPD Config File. @@ -64090,7 +64353,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/okedbry.dhcpd # okedbry DHCPD Config File. @@ -64213,7 +64477,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/oklaipl.dhcpd # oklaipl DHCPD Config File. @@ -64336,7 +64601,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/oknogro.dhcpd # oknogro DHCPD Config File. @@ -64490,7 +64756,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/oknougr.dhcpd # oknougr DHCPD Config File. @@ -64680,7 +64947,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/okwecol.dhcpd # okwecol DHCPD Config File. @@ -64895,7 +65163,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/orpopcs.dhcpd # orpopcs DHCPD Config File. @@ -65236,7 +65505,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/paingro.dhcpd # mielccc DHCPD Config File. @@ -65367,7 +65637,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/palheco.dhcpd # palheco DHCPD Config File. @@ -65490,7 +65761,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/paphevo.dhcpd # paphevo DHCPD Config File. @@ -65775,7 +66047,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/paphrad.dhcpd # paphrad DHCPD Config File. @@ -65979,7 +66252,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/pascgro.dhcpd # pascgro DHCPD Config File. @@ -66119,7 +66393,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/scch411.dhcpd # scch411 DHCPD Config File. @@ -66301,7 +66576,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/scclber.dhcpd # scclber DHCPD Config File. @@ -66424,7 +66700,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/sccouoc.dhcpd # sccouoc DHCPD Config File. @@ -66547,7 +66824,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/scspcsv.dhcpd # scspcsv DHCPD Config File. @@ -66765,7 +67043,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/tnkngak.dhcpd # tnkngak DHCPD Config File. @@ -66888,7 +67167,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/tnknuhe.dhcpd # tnknuhe DHCPD Config File. @@ -67029,7 +67309,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/tnmamar.dhcpd # tnmamar DHCPD Config File. @@ -67219,7 +67500,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/tnmesta.dhcpd # tnmesta DHCPD Config File. @@ -67356,7 +67638,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/tnmucog.dhcpd # tnmucog DHCPD Config File. @@ -67567,7 +67850,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/tnmugro.dhcpd # tnmugro DHCPD Config File. @@ -67772,7 +68056,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/tnmuung.dhcpd # tnmuung DHCPD Config File. @@ -67909,7 +68194,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/tnnapcl.dhcpd # tnnapcl DHCPD Config File. @@ -70707,7 +70993,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/txabgro.dhcpd # txabgro DHCPD Config File. @@ -70857,7 +71144,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/txad102.dhcpd # txad102 DHCPD Config File. @@ -70972,7 +71260,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/txadsav.dhcpd # txadsav DHCPD Config File. @@ -71087,7 +71376,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/txarmav.dhcpd # txarmav DHCPD Config File. @@ -71224,7 +71514,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/txarmid.dhcpd # txarmid DHCPD Config File. @@ -71355,7 +71646,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/txaudoc.dhcpd # txaudoc DHCPD Config File. @@ -71639,7 +71931,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/txcacol.dhcpd # txcacol DHCPD Config File. @@ -71769,7 +72062,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/txcsmel.dhcpd # txcsmel DHCPD Config File. @@ -71892,7 +72186,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/txcsppl.dhcpd # txcsppl DHCPD Config File. @@ -72023,7 +72318,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/txhuuhl.dhcpd # txhuuhl DHCPD Config File. @@ -72236,7 +72532,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/txkiipl.dhcpd # txkiipl DHCPD Config File. @@ -72359,7 +72656,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/txlugro.dhcpd # txlugro DHCPD Config File. @@ -72489,7 +72787,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/txlures.dhcpd # txlures DHCPD Config File. @@ -72595,7 +72894,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/txlutop.dhcpd # txlutop DHCPD Config File. @@ -72736,7 +73036,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/txsaavp.dhcpd # txsaavp DHCPD Config File. @@ -72873,7 +73174,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/txstgro.dhcpd # txstgro DHCPD Config File. @@ -73071,7 +73373,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/txwagro.dhcpd # txwagro DHCPD Config File. @@ -73268,7 +73571,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/txwfgro.dhcpd # txwfgro DHCPD Config File. @@ -73419,7 +73723,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/vachgac.dhcpd # vachgac DHCPD Config File. @@ -73545,7 +73850,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/vanodod.dhcpd # vanodod DHCPD Config File. @@ -73763,7 +74069,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/wachgro.dhcpd # wachgro DHCPD Config File. @@ -73961,7 +74268,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/wapugro.dhcpd # wapugro DHCPD Config File. @@ -74101,7 +74409,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/folder.dhcpd/wvmodis.dhcpd # wvmodis DHCPD Config File. @@ -74273,7 +74582,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/cmts/sites/flhltwc.dhcpd # flhltwc DHCPD Config File. @@ -75639,7 +75949,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/cmts/sites/garwwct.dhcpd # DHCPD garwwct Config File 10/14/2010 @@ -75906,7 +76217,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/cmts/sites/ilcunocubr.dhcpd # DHCPD ilcunocubr Config File 7/17/2010 @@ -76067,7 +76379,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/cmts/sites/ilcudevubr.dhcpd # DHCPD ilcudevubr Config File 7/17/2010 @@ -76212,7 +76525,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/cmts/sites/njedbva.dhcpd # DHCPD njedbva Config File 10/14/2010 @@ -76408,7 +76722,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/cmts/sites/njeddhw.dhcpd # DHCPD njeddhw Config File 10/14/2010 @@ -76664,7 +76979,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/cmts/sites/njedvcm.dhcpd # DHCPD njedvcm Config File 10/14/2010 @@ -76845,7 +77161,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/cmts/sites/njklklr.dhcpd # DHCPD njklklr Config File 10/14/2010 @@ -77001,7 +77318,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/cmts/sites/njucthr.dhcpd # DHCPD njucthr Config File 10/14/2010 @@ -77172,7 +77490,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/cmts/sites/nynytrg.dhcpd # DHCPD nynytrg Regent Config File 10/14/2010 @@ -77319,7 +77638,8 @@ } ] } - ] + ], + "authoritative": true }, /// Begin file dhcp3/cmts/sites/alphgrp.dhcpd # DHCPD alphgrp Config File 07/11/2012 @@ -77470,7 +77790,8 @@ } ] } - ] + ], + "authoritative": true } ] // /// boot-file-name was defined in an unsupported scope diff --git a/keama/tests/dhcp3/master.dhcpd.conf b/keama/tests/dhcp3/master.dhcpd.conf index 8e0f274d..ba1ec866 100644 --- a/keama/tests/dhcp3/master.dhcpd.conf +++ b/keama/tests/dhcp3/master.dhcpd.conf @@ -15,9 +15,6 @@ server-identifier 68.234.128.73; next-server 50.30.208.80; -#add -authoritative; - # TODO: Maybe make the port/peer port different failover peer "NATIONAL" { primary; diff --git a/keama/tests/dhcp3/master.dhcpd.conf.orig b/keama/tests/dhcp3/master.dhcpd.conf.orig deleted file mode 100644 index ba1ec866..00000000 --- a/keama/tests/dhcp3/master.dhcpd.conf.orig +++ /dev/null @@ -1,52 +0,0 @@ -# NATIONAL DHCPD Secondary Failover Peer Unique Configuration -# 2010-12-14 ~bpeterson -# ! ! -# ! DO NOT EDIT ! -# ! ! -# All dhcp configuration files are handled by cfengine at -# meles.srv.pavlovmedia.corp -# Non-unique configuration is contained in dhcp3/common.dhcpd -# Individual dhcp scopes are defined by sitecode as shared networks in -# dhcp3/folder.dhcpd/$SITECODE.dhcpd -# Files are included into the dhcpd.conf with include statements in -# dhcp3/folder.dhcpd/includes.dhcpd - -server-identifier 68.234.128.73; - -next-server 50.30.208.80; - -# TODO: Maybe make the port/peer port different -failover peer "NATIONAL" { - primary; - address 68.234.128.73; - port 647; - peer address 50.30.208.80; - peer port 647; - max-response-delay 60; - max-unacked-updates 10; - load balance max seconds 3; - mclt 1800; - # 300 was original - # 3600 is recommended - split 128; -} - -#Current OpeNMS server -subnet 66.253.253.184 netmask 255.255.255.255 { - host tigris { - hardware ethernet 00:30:48:fe:ce:14; - fixed-address 66.253.253.184; - } -} - -#Old OpenNMS server -#subnet 66.253.253.209 netmask 255.255.255.255 { -# host Canis { -# hardware ethernet 00:06:0D:BE:9C:B3; -# fixed-address 66.253.253.209; -# } -#} - -lease-file-name "/mnt/dhcpd_ramdb/dhcpd.leases"; - -include "dhcp3/common.dhcpd"; diff --git a/keama/tests/duid2.err b/keama/tests/duid2.err index d09404e9..fcbef592 100644 --- a/keama/tests/duid2.err +++ b/keama/tests/duid2.err @@ -1,8 +1,5 @@ # two server duid config -# authoritative is mandatory -authoritative; - # EN server duid declaration server-duid en 2495 "enterprise-specific-identifier-1234"; diff --git a/keama/tests/duid2.msg b/keama/tests/duid2.msg index 19e12f97..06a8a00f 100644 --- a/keama/tests/duid2.msg +++ b/keama/tests/duid2.msg @@ -1 +1 @@ -duid2.err line 10: there is already a server-id +duid2.err line 7: there is already a server-id diff --git a/keama/tests/duiden6.in6 b/keama/tests/duiden6.in6 index 462c6fde..ae8385ea 100644 --- a/keama/tests/duiden6.in6 +++ b/keama/tests/duiden6.in6 @@ -1,7 +1,4 @@ # EN server duid config -# authoritative is mandatory -authoritative; - # EN server duid declaration server-duid en 2495 "enterprise-specific-identifier-1234"; diff --git a/keama/tests/duiden6.out b/keama/tests/duiden6.out index 3be7afda..1e7e3021 100644 --- a/keama/tests/duiden6.out +++ b/keama/tests/duiden6.out @@ -1,8 +1,7 @@ { # EN server duid config - # authoritative is mandatory + # EN server duid declaration "Dhcp6": { - # EN server duid declaration "server-id": { "type": "EN", "enterprise-id": 2495, diff --git a/keama/tests/duidennoid.err b/keama/tests/duidennoid.err index aecf93a9..ae6d12ae 100644 --- a/keama/tests/duidennoid.err +++ b/keama/tests/duidennoid.err @@ -1,8 +1,5 @@ # bad (no identifier) EN server duid config -# authoritative is mandatory -authoritative; - # EN server duid declaration server-duid en 2495; diff --git a/keama/tests/duidennoid.msg b/keama/tests/duidennoid.msg index 36d3f3b1..054fa65e 100644 --- a/keama/tests/duidennoid.msg +++ b/keama/tests/duidennoid.msg @@ -1 +1 @@ -duidennoid.err line 7: identifier expected +duidennoid.err line 4: identifier expected diff --git a/keama/tests/duidennonum.err b/keama/tests/duidennonum.err index 6cad99d4..abdfdd7c 100644 --- a/keama/tests/duidennonum.err +++ b/keama/tests/duidennonum.err @@ -1,7 +1,4 @@ # bad (no number) EN server duid config -# authoritative is mandatory -authoritative; - # EN server duid declaration server-duid en "enterprise-specific-identifier-1234"; diff --git a/keama/tests/duidennonum.msg b/keama/tests/duidennonum.msg index 9500ed90..941a0d03 100644 --- a/keama/tests/duidennonum.msg +++ b/keama/tests/duidennonum.msg @@ -1 +1 @@ -duidennonum.err line 7: enterprise number expected +duidennonum.err line 4: enterprise number expected diff --git a/keama/tests/duidll6.in6 b/keama/tests/duidll6.in6 index b5f0e02e..fac38c7a 100644 --- a/keama/tests/duidll6.in6 +++ b/keama/tests/duidll6.in6 @@ -1,8 +1,5 @@ # LL server duid config -# authoritative is mandatory -authoritative; - # LL server duid declaration server-duid ll; diff --git a/keama/tests/duidll6.out b/keama/tests/duidll6.out index c298ad71..089539d7 100644 --- a/keama/tests/duidll6.out +++ b/keama/tests/duidll6.out @@ -1,8 +1,7 @@ { # LL server duid config - # authoritative is mandatory + # LL server duid declaration "Dhcp6": { - # LL server duid declaration "server-id": { "type": "LL" } diff --git a/keama/tests/duidllbadtype.err b/keama/tests/duidllbadtype.err index a3bd9360..2526f6e1 100644 --- a/keama/tests/duidllbadtype.err +++ b/keama/tests/duidllbadtype.err @@ -1,7 +1,4 @@ # bad (unknown hardware type) LL server duid config -# authoritative is mandatory -authoritative; - # LL server duid declaration server-duid ll foobar 00:16:6F:49:7D:9B; diff --git a/keama/tests/duidllbadtype.msg b/keama/tests/duidllbadtype.msg index f867abca..341ebd0b 100644 --- a/keama/tests/duidllbadtype.msg +++ b/keama/tests/duidllbadtype.msg @@ -1 +1 @@ -duidllbadtype.err line 7: hardware type expected +duidllbadtype.err line 4: hardware type expected diff --git a/keama/tests/duidllhw6.in6 b/keama/tests/duidllhw6.in6 index 0de7ffff..48312801 100644 --- a/keama/tests/duidllhw6.in6 +++ b/keama/tests/duidllhw6.in6 @@ -1,8 +1,5 @@ # LL server duid config -# authoritative is mandatory -authoritative; - # LL server duid declaration server-duid ll ethernet 00:16:6F:49:7D:9B; diff --git a/keama/tests/duidllhw6.out b/keama/tests/duidllhw6.out index e2f9c813..ad7fbdac 100644 --- a/keama/tests/duidllhw6.out +++ b/keama/tests/duidllhw6.out @@ -1,8 +1,7 @@ { # LL server duid config - # authoritative is mandatory + # LL server duid declaration "Dhcp6": { - # LL server duid declaration "server-id": { "type": "LL", "htype": 1, diff --git a/keama/tests/duidllnohw.err b/keama/tests/duidllnohw.err index ee2caa7a..a93b90d3 100644 --- a/keama/tests/duidllnohw.err +++ b/keama/tests/duidllnohw.err @@ -1,7 +1,4 @@ # bad (no hardware address) LL server duid config -# authoritative is mandatory -authoritative; - # LL server duid declaration server-duid ll fddi; diff --git a/keama/tests/duidllnohw.msg b/keama/tests/duidllnohw.msg index 6c66c7c8..b2d955ec 100644 --- a/keama/tests/duidllnohw.msg +++ b/keama/tests/duidllnohw.msg @@ -1 +1 @@ -duidllnohw.err line 7: expecting hexadecimal number. +duidllnohw.err line 4: expecting hexadecimal number. diff --git a/keama/tests/duidllt6.in6 b/keama/tests/duidllt6.in6 index 13003af8..25420b3c 100644 --- a/keama/tests/duidllt6.in6 +++ b/keama/tests/duidllt6.in6 @@ -1,8 +1,5 @@ # LLT server duid config -# authoritative is mandatory -authoritative; - # LLT server duid declaration server-duid llt; diff --git a/keama/tests/duidllt6.out b/keama/tests/duidllt6.out index 39a017bd..2a1ea79e 100644 --- a/keama/tests/duidllt6.out +++ b/keama/tests/duidllt6.out @@ -1,8 +1,7 @@ { # LLT server duid config - # authoritative is mandatory + # LLT server duid declaration "Dhcp6": { - # LLT server duid declaration "server-id": { "type": "LLT" } diff --git a/keama/tests/duidlltbadtype.err b/keama/tests/duidlltbadtype.err index 4650daac..66ab6642 100644 --- a/keama/tests/duidlltbadtype.err +++ b/keama/tests/duidlltbadtype.err @@ -1,7 +1,4 @@ # bad (unknown hardware type) LLT server duid config -# authoritative is mandatory -authoritative; - # LLT server duid declaration server-duid llt foobar 213982198 00:16:6F:49:7D:9B; diff --git a/keama/tests/duidlltbadtype.msg b/keama/tests/duidlltbadtype.msg index 14fc5e44..32305a75 100644 --- a/keama/tests/duidlltbadtype.msg +++ b/keama/tests/duidlltbadtype.msg @@ -1 +1 @@ -duidlltbadtype.err line 7: hardware type expected +duidlltbadtype.err line 4: hardware type expected diff --git a/keama/tests/duidlltnohw.err b/keama/tests/duidlltnohw.err index 10f8bf02..3208ed60 100644 --- a/keama/tests/duidlltnohw.err +++ b/keama/tests/duidlltnohw.err @@ -1,7 +1,4 @@ # bad (no hardware address) LLT server duid config -# authoritative is mandatory -authoritative; - # LLT server duid declaration server-duid llt token-ring 213982198; diff --git a/keama/tests/duidlltnohw.msg b/keama/tests/duidlltnohw.msg index b1aee1f9..7bfaa245 100644 --- a/keama/tests/duidlltnohw.msg +++ b/keama/tests/duidlltnohw.msg @@ -1 +1 @@ -duidlltnohw.err line 7: expecting hexadecimal number. +duidlltnohw.err line 4: expecting hexadecimal number. diff --git a/keama/tests/duidlltnotime.err b/keama/tests/duidlltnotime.err index 92a387f1..f53321bb 100644 --- a/keama/tests/duidlltnotime.err +++ b/keama/tests/duidlltnotime.err @@ -1,7 +1,4 @@ # bad (no timestamp) LLT server duid config -# authoritative is mandatory -authoritative; - # LLT server duid declaration server-duid llt token-ring A8:16:6F:49:7D:9B; diff --git a/keama/tests/duidlltnotime.msg b/keama/tests/duidlltnotime.msg index c176c4d8..2b7fb8a3 100644 --- a/keama/tests/duidlltnotime.msg +++ b/keama/tests/duidlltnotime.msg @@ -1 +1 @@ -duidlltnotime.err line 7: timestamp expected +duidlltnotime.err line 4: timestamp expected diff --git a/keama/tests/duidlltthw4.err4 b/keama/tests/duidlltthw4.err4 index 4c2d2b63..ae039d18 100644 --- a/keama/tests/duidlltthw4.err4 +++ b/keama/tests/duidlltthw4.err4 @@ -1,7 +1,4 @@ # LLT server duid config -# authoritative is mandatory -authoritative; - # LLT server duid declaration server-duid llt token-ring 213982198 00:16:6F:49:7D:9B; diff --git a/keama/tests/duidlltthw4.msg b/keama/tests/duidlltthw4.msg index 7e842d2d..df163bb1 100644 --- a/keama/tests/duidlltthw4.msg +++ b/keama/tests/duidlltthw4.msg @@ -1 +1 @@ -duidlltthw4.err4 line 7: expecting a parameter or declaration +duidlltthw4.err4 line 4: expecting a parameter or declaration diff --git a/keama/tests/duidlltthw6.in6 b/keama/tests/duidlltthw6.in6 index 4c2d2b63..ae039d18 100644 --- a/keama/tests/duidlltthw6.in6 +++ b/keama/tests/duidlltthw6.in6 @@ -1,7 +1,4 @@ # LLT server duid config -# authoritative is mandatory -authoritative; - # LLT server duid declaration server-duid llt token-ring 213982198 00:16:6F:49:7D:9B; diff --git a/keama/tests/duidlltthw6.out b/keama/tests/duidlltthw6.out index e7f3cea8..de2d0a48 100644 --- a/keama/tests/duidlltthw6.out +++ b/keama/tests/duidlltthw6.out @@ -1,8 +1,7 @@ { # LLT server duid config - # authoritative is mandatory + # LLT server duid declaration "Dhcp6": { - # LLT server duid declaration "server-id": { "type": "LLT", "htype": 6, diff --git a/keama/tests/duidnoid.err b/keama/tests/duidnoid.err index e018478c..32a2c9cb 100644 --- a/keama/tests/duidnoid.err +++ b/keama/tests/duidnoid.err @@ -1,7 +1,4 @@ # bad (no identifier) numeric server duid config -# authoritative is mandatory -authoritative; - # server duid declaration server-duid 9; diff --git a/keama/tests/duidnoid.msg b/keama/tests/duidnoid.msg index 8ab2b0ba..3e44395a 100644 --- a/keama/tests/duidnoid.msg +++ b/keama/tests/duidnoid.msg @@ -1 +1 @@ -duidnoid.err line 7: identifier expected +duidnoid.err line 4: identifier expected diff --git a/keama/tests/enableupdates6.in6 b/keama/tests/enableupdates6.in6 index ce2427b2..b6641957 100644 --- a/keama/tests/enableupdates6.in6 +++ b/keama/tests/enableupdates6.in6 @@ -1,8 +1,5 @@ # ddns-updates (aka enable-updates) -# authoritative is mandatory -authoritative; - ddns-updates on; # embedded diff --git a/keama/tests/enableupdates6.out b/keama/tests/enableupdates6.out index 21e8d114..8d20a773 100644 --- a/keama/tests/enableupdates6.out +++ b/keama/tests/enableupdates6.out @@ -1,6 +1,5 @@ { # ddns-updates (aka enable-updates) - # authoritative is mandatory "Dhcp6": { "dhcp-ddns": { /// Unspecified ddns-domainname (default domain-name option value) diff --git a/keama/tests/encodedx6.in6 b/keama/tests/encodedx6.in6 index 11216659..f6b16377 100644 --- a/keama/tests/encodedx6.in6 +++ b/keama/tests/encodedx6.in6 @@ -1,8 +1,5 @@ # encode data expression and extract numeric expression -# authoritative is mandatory -authoritative; - # empty configs are not accepted by Kea default-lease-time 1800; diff --git a/keama/tests/encodedx6.out b/keama/tests/encodedx6.out index 5f1dba85..d1b8b38a 100644 --- a/keama/tests/encodedx6.out +++ b/keama/tests/encodedx6.out @@ -1,6 +1,6 @@ { # encode data expression and extract numeric expression - # authoritative is mandatory + # empty configs are not accepted by Kea "Dhcp6": { "valid-lifetime": 1800, "client-classes": [ diff --git a/keama/tests/escapestring4.in4 b/keama/tests/escapestring4.in4 index fa1083bf..3f318e6c 100644 --- a/keama/tests/escapestring4.in4 +++ b/keama/tests/escapestring4.in4 @@ -1,8 +1,5 @@ # string option-data with embedded commas -# authoritative is mandatory -authoritative; - # vendor option space option a-string code 250 = text; diff --git a/keama/tests/escapestring4.out b/keama/tests/escapestring4.out index 5719e4ad..caef76c3 100644 --- a/keama/tests/escapestring4.out +++ b/keama/tests/escapestring4.out @@ -1,9 +1,8 @@ { # string option-data with embedded commas - # authoritative is mandatory + # vendor option space "Dhcp4": { "option-def": [ - # vendor option space { "space": "dhcp4", "name": "a-string", diff --git a/keama/tests/execstatement4.in4 b/keama/tests/execstatement4.in4 index d727cdad..6adc6b1e 100644 --- a/keama/tests/execstatement4.in4 +++ b/keama/tests/execstatement4.in4 @@ -1,8 +1,5 @@ # DHCPv4 executable statement config -# authoritative is mandatory -authoritative; - # empty configs are not accepted by Kea default-lease-time 1800; diff --git a/keama/tests/execstatement4.out b/keama/tests/execstatement4.out index 0086dd00..4988de92 100644 --- a/keama/tests/execstatement4.out +++ b/keama/tests/execstatement4.out @@ -1,6 +1,6 @@ { # DHCPv4 executable statement config - # authoritative is mandatory + # empty configs are not accepted by Kea "Dhcp4": { "valid-lifetime": 1800 // # impossible to convert statement statement diff --git a/keama/tests/execstatement6.in6 b/keama/tests/execstatement6.in6 index 5ac8358d..fe49424a 100644 --- a/keama/tests/execstatement6.in6 +++ b/keama/tests/execstatement6.in6 @@ -1,8 +1,5 @@ # DHCPv6 executable statement config -# authoritative is mandatory -authoritative; - # empty configs are not accepted by Kea default-lease-time 1800; diff --git a/keama/tests/execstatement6.out b/keama/tests/execstatement6.out index a12e8b10..25ac01af 100644 --- a/keama/tests/execstatement6.out +++ b/keama/tests/execstatement6.out @@ -1,6 +1,6 @@ { # DHCPv6 executable statement config - # authoritative is mandatory + # empty configs are not accepted by Kea "Dhcp6": { "valid-lifetime": 1800 // # impossible to convert statement statement diff --git a/keama/tests/existsbx4.in4 b/keama/tests/existsbx4.in4 index 437a96f2..650a208e 100644 --- a/keama/tests/existsbx4.in4 +++ b/keama/tests/existsbx4.in4 @@ -1,8 +1,5 @@ # exists boolean expression -# authoritative is mandatory -authoritative; - # empty configs are not accepted by Kea default-lease-time 1800; diff --git a/keama/tests/existsbx4.out b/keama/tests/existsbx4.out index d1100b11..7d977ac6 100644 --- a/keama/tests/existsbx4.out +++ b/keama/tests/existsbx4.out @@ -1,6 +1,6 @@ { # exists boolean expression - # authoritative is mandatory + # empty configs are not accepted by Kea "Dhcp4": { "valid-lifetime": 1800, "client-classes": [ diff --git a/keama/tests/filename4.in4 b/keama/tests/filename4.in4 index a08915bb..9bf3ad00 100644 --- a/keama/tests/filename4.in4 +++ b/keama/tests/filename4.in4 @@ -1,8 +1,5 @@ # filename (aka boot-file-name) and server-name (aka server-hostname) -# authoritative is mandatory -authoritative; - filename "/var/boot/boot1"; server-name "foobar.biz"; diff --git a/keama/tests/filename4.out b/keama/tests/filename4.out index 4755a38d..a391eca5 100644 --- a/keama/tests/filename4.out +++ b/keama/tests/filename4.out @@ -1,6 +1,5 @@ { # filename (aka boot-file-name) and server-name (aka server-hostname) - # authoritative is mandatory "Dhcp4": { // /// boot-file-name was defined in an unsupported scope // "boot-file-name": "/var/boot/boot1", diff --git a/keama/tests/fordhcp/kea.json b/keama/tests/fordhcp/kea.json index da875e06..842248e2 100644 --- a/keama/tests/fordhcp/kea.json +++ b/keama/tests/fordhcp/kea.json @@ -56,6 +56,7 @@ "dhcp-ddns": { "enable-updates": false }, + "authoritative": true, "option-data": [ { "space": "dhcp4", @@ -155,40 +156,32 @@ // ] // }, "subnet4": [ -// /// Begin file fordhcp/dhcpd.stubs.conf -// # These are stub subnets to inform the DHCP server that they exist. -// # sql1-blue, the "outside" network -// /// Not authorized subnet -// /// This feature is not supported by Kea -// /// Skipping the subnet only partially simulates it -// { -// "id": 1, -// "subnet": "149.20.48.0/25" -// }, -// # 187-net is all but dead -// /// Not authorized subnet -// /// This feature is not supported by Kea -// /// Skipping the subnet only partially simulates it -// { -// "id": 2, -// "subnet": "204.152.187.0/24" -// }, -// # QuickBooks/GreatPlains VLAN -// /// Not authorized subnet -// /// This feature is not supported by Kea -// /// Skipping the subnet only partially simulates it -// { -// "id": 3, -// "subnet": "149.20.48.128/28" -// }, -// # Device management VLAN -// /// Not authorized subnet -// /// This feature is not supported by Kea -// /// Skipping the subnet only partially simulates it -// { -// "id": 4, -// "subnet": "149.20.60.0/24" -// }, + /// Begin file fordhcp/dhcpd.stubs.conf + # These are stub subnets to inform the DHCP server that they exist. + # sql1-blue, the "outside" network + { + "id": 1, + "subnet": "149.20.48.0/25", + "authoritative": false + }, + # 187-net is all but dead + { + "id": 2, + "subnet": "204.152.187.0/24", + "authoritative": false + }, + # QuickBooks/GreatPlains VLAN + { + "id": 3, + "subnet": "149.20.48.128/28", + "authoritative": false + }, + # Device management VLAN + { + "id": 4, + "subnet": "149.20.60.0/24", + "authoritative": false + }, /// Begin file fordhcp/dhcpd.voip.conf # dhcpd.voip.conf file for Voice over IP phone network served by the 950 # charter #failover peerset. This file may be copied to /etc between these diff --git a/keama/tests/fqdncompressed.err6 b/keama/tests/fqdncompressed.err6 index c8816915..aed1fe63 100644 --- a/keama/tests/fqdncompressed.err6 +++ b/keama/tests/fqdncompressed.err6 @@ -1,8 +1,5 @@ # option definition config -# authoritative is mandatory -authoritative; - # options option space foobar; diff --git a/keama/tests/fqdncompressed.msg b/keama/tests/fqdncompressed.msg index ccc21253..cfd157ef 100644 --- a/keama/tests/fqdncompressed.msg +++ b/keama/tests/fqdncompressed.msg @@ -1 +1 @@ -fqdncompressed.err6 line 10: domain list in DHCPv6 MUST NOT be compressed +fqdncompressed.err6 line 7: domain list in DHCPv6 MUST NOT be compressed diff --git a/keama/tests/gcet/kea.json b/keama/tests/gcet/kea.json index a552298b..24dce1e2 100644 --- a/keama/tests/gcet/kea.json +++ b/keama/tests/gcet/kea.json @@ -2,6 +2,7 @@ /// This configuration declares some subnets but has no interfaces-config /// Reference Kea #245 "Dhcp4": { + "authoritative": true, "option-def": [ { "space": "RKUS", diff --git a/keama/tests/groupclass4.in4 b/keama/tests/groupclass4.in4 index ebf4f7fc..b306f66f 100644 --- a/keama/tests/groupclass4.in4 +++ b/keama/tests/groupclass4.in4 @@ -1,8 +1,5 @@ # group and class declaration config -# authoritative is mandatory -authoritative; - # options option mysystem code 250 = text; option myversion code 251 = unsigned integer 16; diff --git a/keama/tests/groupclass4.out b/keama/tests/groupclass4.out index 7039d79a..71e40072 100644 --- a/keama/tests/groupclass4.out +++ b/keama/tests/groupclass4.out @@ -1,9 +1,8 @@ { # group and class declaration config - # authoritative is mandatory + # options "Dhcp4": { "option-def": [ - # options { "space": "dhcp4", "name": "mysystem", diff --git a/keama/tests/groupclass6.in6 b/keama/tests/groupclass6.in6 index 2c4e1328..4cc21b78 100644 --- a/keama/tests/groupclass6.in6 +++ b/keama/tests/groupclass6.in6 @@ -1,8 +1,5 @@ # group and class declaration config -# authoritative is mandatory -authoritative; - # options option dhcp6.mysystem code 1250 = text; option dhcp6.myversion code 1251 = unsigned integer 16; diff --git a/keama/tests/groupclass6.out b/keama/tests/groupclass6.out index bdb449c0..68144b89 100644 --- a/keama/tests/groupclass6.out +++ b/keama/tests/groupclass6.out @@ -1,9 +1,8 @@ { # group and class declaration config - # authoritative is mandatory + # options "Dhcp6": { "option-def": [ - # options { "space": "dhcp6", "name": "mysystem", diff --git a/keama/tests/groupgroup4.in4 b/keama/tests/groupgroup4.in4 index 5b870477..3be93d7d 100644 --- a/keama/tests/groupgroup4.in4 +++ b/keama/tests/groupgroup4.in4 @@ -1,8 +1,5 @@ # multiple groups declaration config -# authoritative is mandatory -authoritative; - # options option mysystem code 250 = text; option myversion code 251 = unsigned integer 16; diff --git a/keama/tests/groupgroup4.out b/keama/tests/groupgroup4.out index a87f59b7..09dd0574 100644 --- a/keama/tests/groupgroup4.out +++ b/keama/tests/groupgroup4.out @@ -1,9 +1,8 @@ { # multiple groups declaration config - # authoritative is mandatory + # options "Dhcp4": { "option-def": [ - # options { "space": "dhcp4", "name": "mysystem", diff --git a/keama/tests/grouphost4.in4 b/keama/tests/grouphost4.in4 index 370f3baf..da9d5291 100644 --- a/keama/tests/grouphost4.in4 +++ b/keama/tests/grouphost4.in4 @@ -1,8 +1,5 @@ # group and host declarations config -# authoritative is mandatory -authoritative; - # subnet4 declaration subnet 10.5.5.0 netmask 255.255.255.224 { range 10.5.5.5 10.5.5.10; diff --git a/keama/tests/grouphost4.out b/keama/tests/grouphost4.out index 863d2a65..675a5ec9 100644 --- a/keama/tests/grouphost4.out +++ b/keama/tests/grouphost4.out @@ -1,11 +1,10 @@ { # group and host declarations config - # authoritative is mandatory + # subnet4 declaration /// This configuration declares some subnets but has no interfaces-config /// Reference Kea #245 "Dhcp4": { "subnet4": [ - # subnet4 declaration { "id": 1, "subnet": "10.5.5.0/27", diff --git a/keama/tests/groupsubnet4.in4 b/keama/tests/groupsubnet4.in4 index ecdaea5f..a7a199dc 100644 --- a/keama/tests/groupsubnet4.in4 +++ b/keama/tests/groupsubnet4.in4 @@ -1,8 +1,5 @@ # Group with DHCPv4 subnet declaration config -# authoritative is mandatory -authoritative; - # parameter which will be changed in subnet default-lease-time 1200; diff --git a/keama/tests/groupsubnet4.out b/keama/tests/groupsubnet4.out index 5c6a83d2..f2db5f85 100644 --- a/keama/tests/groupsubnet4.out +++ b/keama/tests/groupsubnet4.out @@ -1,6 +1,6 @@ { # Group with DHCPv4 subnet declaration config - # authoritative is mandatory + # parameter which will be changed in subnet "Dhcp4": { "valid-lifetime": 1200, "interfaces-config": { diff --git a/keama/tests/groupsubnet6.in6 b/keama/tests/groupsubnet6.in6 index bc3f9ffd..90277618 100644 --- a/keama/tests/groupsubnet6.in6 +++ b/keama/tests/groupsubnet6.in6 @@ -1,8 +1,5 @@ # Group with DHCPv6 subnet declaration config -# authoritative is mandatory -authoritative; - # parameter which will be changed in subnet default-lease-time 1200; diff --git a/keama/tests/groupsubnet6.out b/keama/tests/groupsubnet6.out index 88f7cb4f..63d5794e 100644 --- a/keama/tests/groupsubnet6.out +++ b/keama/tests/groupsubnet6.out @@ -1,6 +1,6 @@ { # Group with DHCPv6 subnet declaration config - # authoritative is mandatory + # parameter which will be changed in subnet "Dhcp6": { "valid-lifetime": 1200, "interfaces-config": { diff --git a/keama/tests/groupsubnetif.err4 b/keama/tests/groupsubnetif.err4 index 7c3801e9..9a407b11 100644 --- a/keama/tests/groupsubnetif.err4 +++ b/keama/tests/groupsubnetif.err4 @@ -1,8 +1,5 @@ # bad (interface unlnown in this cope) group declaration config -# authoritative is mandatory -authoritative; - # parameter which will be changed in subnet default-lease-time 1200; diff --git a/keama/tests/groupsubnetif.msg b/keama/tests/groupsubnetif.msg index f89aed88..1828b932 100644 --- a/keama/tests/groupsubnetif.msg +++ b/keama/tests/groupsubnetif.msg @@ -1 +1 @@ -groupsubnetif.err4 line 10: expecting a parameter or declaration +groupsubnetif.err4 line 7: expecting a parameter or declaration diff --git a/keama/tests/hardware2dx4.in4 b/keama/tests/hardware2dx4.in4 index 176c4968..73046612 100644 --- a/keama/tests/hardware2dx4.in4 +++ b/keama/tests/hardware2dx4.in4 @@ -1,8 +1,5 @@ # simplified hardware data expression -# authoritative is mandatory -authoritative; - # hardware type class class "ethernet" { match if substring(hardware, 0, 1) = encode-int(1, 8); diff --git a/keama/tests/hardware2dx4.out b/keama/tests/hardware2dx4.out index f29508af..77c3f533 100644 --- a/keama/tests/hardware2dx4.out +++ b/keama/tests/hardware2dx4.out @@ -1,9 +1,8 @@ { # simplified hardware data expression - # authoritative is mandatory + # hardware type class "Dhcp4": { "client-classes": [ - # hardware type class { "name": "ethernet", /// from: match if (substring(hardware, 0, 1)) = (encode-int(1, 8)) diff --git a/keama/tests/hardwaredx4.in4 b/keama/tests/hardwaredx4.in4 index eb41c383..46160776 100644 --- a/keama/tests/hardwaredx4.in4 +++ b/keama/tests/hardwaredx4.in4 @@ -1,8 +1,5 @@ # hardware data expression -# authoritative is mandatory -authoritative; - # empty configs are not accepted by Kea default-lease-time 1800; diff --git a/keama/tests/hardwaredx4.out b/keama/tests/hardwaredx4.out index 114ecb41..a3f13938 100644 --- a/keama/tests/hardwaredx4.out +++ b/keama/tests/hardwaredx4.out @@ -1,6 +1,6 @@ { # hardware data expression - # authoritative is mandatory + # empty configs are not accepted by Kea "Dhcp4": { "valid-lifetime": 1800, "client-classes": [ diff --git a/keama/tests/hostidentifier4.inL b/keama/tests/hostidentifier4.inL index 5576307b..9e50ddd3 100644 --- a/keama/tests/hostidentifier4.inL +++ b/keama/tests/hostidentifier4.inL @@ -1,8 +1,5 @@ # host declaration with flexible identifiers config -# authoritative is mandatory -authoritative; - # subnet4 declaration subnet 10.5.5.0 netmask 255.255.255.224 { range 10.5.5.5 10.5.5.10; diff --git a/keama/tests/hostidentifier4.outL b/keama/tests/hostidentifier4.outL index d520c007..b86d253e 100644 --- a/keama/tests/hostidentifier4.outL +++ b/keama/tests/hostidentifier4.outL @@ -1,11 +1,10 @@ { # host declaration with flexible identifiers config - # authoritative is mandatory + # subnet4 declaration /// This configuration declares some subnets but has no interfaces-config /// Reference Kea #245 "Dhcp4": { "subnet4": [ - # subnet4 declaration { "id": 1, "subnet": "10.5.5.0/27", diff --git a/keama/tests/hostname4.in4 b/keama/tests/hostname4.in4 index 65f28e8e..8e2db319 100644 --- a/keama/tests/hostname4.in4 +++ b/keama/tests/hostname4.in4 @@ -1,8 +1,5 @@ # host name config -# authoritative is mandatory -authoritative; - # subnet4 declaration subnet 10.5.5.0 netmask 255.255.255.224 { range 10.5.5.5 10.5.5.10; diff --git a/keama/tests/hostname4.out b/keama/tests/hostname4.out index 6e46c248..7a137355 100644 --- a/keama/tests/hostname4.out +++ b/keama/tests/hostname4.out @@ -1,11 +1,10 @@ { # host name config - # authoritative is mandatory + # subnet4 declaration /// This configuration declares some subnets but has no interfaces-config /// Reference Kea #245 "Dhcp4": { "subnet4": [ - # subnet4 declaration { "id": 1, "subnet": "10.5.5.0/27", diff --git a/keama/tests/hostuid4.in4 b/keama/tests/hostuid4.in4 index 3b8238d5..867fa8b4 100644 --- a/keama/tests/hostuid4.in4 +++ b/keama/tests/hostuid4.in4 @@ -1,8 +1,5 @@ # host declaration with client-identfiers config -# authoritative is mandatory -authoritative; - # subnet4 declaration subnet 10.5.5.0 netmask 255.255.255.224 { range 10.5.5.5 10.5.5.10; diff --git a/keama/tests/hostuid4.out b/keama/tests/hostuid4.out index 96c3ce49..f9ae2437 100644 --- a/keama/tests/hostuid4.out +++ b/keama/tests/hostuid4.out @@ -1,11 +1,10 @@ { # host declaration with client-identfiers config - # authoritative is mandatory + # subnet4 declaration /// This configuration declares some subnets but has no interfaces-config /// Reference Kea #245 "Dhcp4": { "subnet4": [ - # subnet4 declaration { "id": 1, "subnet": "10.5.5.0/27", diff --git a/keama/tests/ifxsc4.in4 b/keama/tests/ifxsc4.in4 index 6659bbbe..b3a59bcc 100644 --- a/keama/tests/ifxsc4.in4 +++ b/keama/tests/ifxsc4.in4 @@ -1,8 +1,5 @@ # if executable statement construct -# authoritative is mandatory -authoritative; - # empty configs are not accepted by Kea default-lease-time 1800; diff --git a/keama/tests/ifxsc4.out b/keama/tests/ifxsc4.out index 1b7575fd..ca086910 100644 --- a/keama/tests/ifxsc4.out +++ b/keama/tests/ifxsc4.out @@ -1,6 +1,6 @@ { # if executable statement construct - # authoritative is mandatory + # empty configs are not accepted by Kea "Dhcp4": { "valid-lifetime": 1800 // # if statement diff --git a/keama/tests/ipaddr6.in6 b/keama/tests/ipaddr6.in6 index 1b28a188..60c27175 100644 --- a/keama/tests/ipaddr6.in6 +++ b/keama/tests/ipaddr6.in6 @@ -1,6 +1,3 @@ # IPv6 addresses config -# authoritative is mandatory -authoritative; - option dhcp6.name-servers 2001::, 200a::0bF, 2001::192.168.0.1; diff --git a/keama/tests/ipaddr6.out b/keama/tests/ipaddr6.out index 0b7ac56a..b2118c61 100644 --- a/keama/tests/ipaddr6.out +++ b/keama/tests/ipaddr6.out @@ -1,6 +1,5 @@ { # IPv6 addresses config - # authoritative is mandatory "Dhcp6": { "option-data": [ { diff --git a/keama/tests/ipaddrhost4.in4 b/keama/tests/ipaddrhost4.in4 index a45b24e6..1c43f81b 100644 --- a/keama/tests/ipaddrhost4.in4 +++ b/keama/tests/ipaddrhost4.in4 @@ -1,8 +1,5 @@ # hostname config -# authoritative is mandatory -authoritative; - host test1 { hardware ethernet 00:07:0E:36:48:19; fixed-address www.isc.org; diff --git a/keama/tests/ipaddrhost4.out b/keama/tests/ipaddrhost4.out index bed8f7b4..264696ee 100644 --- a/keama/tests/ipaddrhost4.out +++ b/keama/tests/ipaddrhost4.out @@ -1,6 +1,5 @@ { # hostname config - # authoritative is mandatory /// This configuration declares some subnets but has no interfaces-config /// Reference Kea #245 "Dhcp4": { diff --git a/keama/tests/listarray.err b/keama/tests/listarray.err index b631c02a..14082605 100644 --- a/keama/tests/listarray.err +++ b/keama/tests/listarray.err @@ -1,8 +1,5 @@ # option definition config -# authoritative is mandatory -authoritative; - # options option space foobar; diff --git a/keama/tests/listarray.msg b/keama/tests/listarray.msg index 572c3656..2a363531 100644 --- a/keama/tests/listarray.msg +++ b/keama/tests/listarray.msg @@ -1 +1 @@ -listarray.err line 10: arrays of text strings not yet supported. +listarray.err line 7: arrays of text strings not yet supported. diff --git a/keama/tests/minimal4.in4 b/keama/tests/minimal4.in4 index b7b4ae13..cfcc1282 100644 --- a/keama/tests/minimal4.in4 +++ b/keama/tests/minimal4.in4 @@ -1,7 +1,4 @@ # DHCPv4 minimal config -# authoritative is mandatory -authoritative; - # empty configs are not accepted by Kea default-lease-time 1800; diff --git a/keama/tests/minimal4.out b/keama/tests/minimal4.out index 52dca9a7..e256972c 100644 --- a/keama/tests/minimal4.out +++ b/keama/tests/minimal4.out @@ -1,6 +1,6 @@ { # DHCPv4 minimal config - # authoritative is mandatory + # empty configs are not accepted by Kea "Dhcp4": { "valid-lifetime": 1800 } diff --git a/keama/tests/minimal6.in6 b/keama/tests/minimal6.in6 index 02f95274..57c83491 100644 --- a/keama/tests/minimal6.in6 +++ b/keama/tests/minimal6.in6 @@ -1,7 +1,4 @@ # DHCPv6 minimal config -# authoritative is mandatory -authoritative; - # empty configs are not accepted by Kea default-lease-time 1800; diff --git a/keama/tests/minimal6.out b/keama/tests/minimal6.out index dfafcf75..c07d37fd 100644 --- a/keama/tests/minimal6.out +++ b/keama/tests/minimal6.out @@ -1,6 +1,6 @@ { # DHCPv6 minimal config - # authoritative is mandatory + # empty configs are not accepted by Kea "Dhcp6": { "valid-lifetime": 1800 } diff --git a/keama/tests/mixedarray.err b/keama/tests/mixedarray.err index d79184fb..507aca78 100644 --- a/keama/tests/mixedarray.err +++ b/keama/tests/mixedarray.err @@ -1,8 +1,5 @@ # option definition config -# authoritative is mandatory -authoritative; - # options option space foobar; diff --git a/keama/tests/mixedarray.msg b/keama/tests/mixedarray.msg index 4bf4ed44..c409ad01 100644 --- a/keama/tests/mixedarray.msg +++ b/keama/tests/mixedarray.msg @@ -1 +1 @@ -mixedarray.err line 10: only uniform array inside record. +mixedarray.err line 7: only uniform array inside record. diff --git a/keama/tests/nestarray.err b/keama/tests/nestarray.err index 99818c33..58f16bbe 100644 --- a/keama/tests/nestarray.err +++ b/keama/tests/nestarray.err @@ -1,8 +1,5 @@ # option definition config -# authoritative is mandatory -authoritative; - # options option space foobar; diff --git a/keama/tests/nestarray.msg b/keama/tests/nestarray.msg index 9e2ab866..92335fad 100644 --- a/keama/tests/nestarray.msg +++ b/keama/tests/nestarray.msg @@ -1 +1 @@ -nestarray.err line 10: no nested arrays. +nestarray.err line 7: no nested arrays. diff --git a/keama/tests/noauth4.err4 b/keama/tests/noauth4.in4 index 47ab68dc..e2fce24c 100644 --- a/keama/tests/noauth4.err4 +++ b/keama/tests/noauth4.in4 @@ -1,6 +1,6 @@ # no(t) authoritative config -# authoritative is mandatory +# authoritative is no longer mandatory #authoritative; subnet 10.5.5.0 netmask 255.255.255.224 { } diff --git a/keama/tests/noauth4.msg b/keama/tests/noauth4.msg deleted file mode 100644 index b99a243b..00000000 --- a/keama/tests/noauth4.msg +++ /dev/null @@ -1 +0,0 @@ -noauth4.err4 line 6: missing top level authoritative statement diff --git a/keama/tests/noauth4.out b/keama/tests/noauth4.out new file mode 100644 index 00000000..8dac17f7 --- /dev/null +++ b/keama/tests/noauth4.out @@ -0,0 +1,15 @@ +{ + # no(t) authoritative config + # authoritative is no longer mandatory + #authoritative; + /// This configuration declares some subnets but has no interfaces-config + /// Reference Kea #245 + "Dhcp4": { + "subnet4": [ + { + "id": 1, + "subnet": "10.5.5.0/27" + } + ] + } +} diff --git a/keama/tests/noauth6.err6 b/keama/tests/noauth6.in6 index eb3b2dcb..42894e91 100644 --- a/keama/tests/noauth6.err6 +++ b/keama/tests/noauth6.in6 @@ -1,6 +1,6 @@ # no(t) authoritative config -# authoritative is mandatory +# authoritative is no longer mandatory #authoritative; subnet6 2001::/64 { } diff --git a/keama/tests/noauth6.msg b/keama/tests/noauth6.msg deleted file mode 100644 index 3e5b0f54..00000000 --- a/keama/tests/noauth6.msg +++ /dev/null @@ -1 +0,0 @@ -noauth6.err6 line 6: missing top level authoritative statement diff --git a/keama/tests/noauth6.out b/keama/tests/noauth6.out new file mode 100644 index 00000000..93f8429e --- /dev/null +++ b/keama/tests/noauth6.out @@ -0,0 +1,15 @@ +{ + # no(t) authoritative config + # authoritative is no longer mandatory + #authoritative; + /// This configuration declares some subnets but has no interfaces-config + /// Reference Kea #245 + "Dhcp6": { + "subnet6": [ + { + "id": 1, + "subnet": "2001::/64" + } + ] + } +} diff --git a/keama/tests/notbx4.in4 b/keama/tests/notbx4.in4 index 10bb97f8..6248b8c6 100644 --- a/keama/tests/notbx4.in4 +++ b/keama/tests/notbx4.in4 @@ -1,8 +1,5 @@ # not boolean expression -# authoritative is mandatory -authoritative; - # empty configs are not accepted by Kea default-lease-time 1800; diff --git a/keama/tests/notbx4.out b/keama/tests/notbx4.out index e3ede6aa..186cdfff 100644 --- a/keama/tests/notbx4.out +++ b/keama/tests/notbx4.out @@ -1,6 +1,6 @@ { # not boolean expression - # authoritative is mandatory + # empty configs are not accepted by Kea "Dhcp4": { "valid-lifetime": 1800, "client-classes": [ diff --git a/keama/tests/notnotbx4.in4 b/keama/tests/notnotbx4.in4 index 2c16c1f4..e9d98800 100644 --- a/keama/tests/notnotbx4.in4 +++ b/keama/tests/notnotbx4.in4 @@ -1,8 +1,5 @@ # double not boolean expression -# authoritative is mandatory -authoritative; - # empty configs are not accepted by Kea default-lease-time 1800; diff --git a/keama/tests/notnotbx4.out b/keama/tests/notnotbx4.out index 43435960..ae1878cc 100644 --- a/keama/tests/notnotbx4.out +++ b/keama/tests/notnotbx4.out @@ -1,6 +1,6 @@ { # double not boolean expression - # authoritative is mandatory + # empty configs are not accepted by Kea "Dhcp4": { "valid-lifetime": 1800, "client-classes": [ diff --git a/keama/tests/nxdomainnx6.in6 b/keama/tests/nxdomainnx6.in6 index f98805f5..f2a2e0f5 100644 --- a/keama/tests/nxdomainnx6.in6 +++ b/keama/tests/nxdomainnx6.in6 @@ -1,8 +1,5 @@ # nxdomain numeric expression -# authoritative is mandatory -authoritative; - # empty configs are not accepted by Kea default-lease-time 1800; diff --git a/keama/tests/nxdomainnx6.out b/keama/tests/nxdomainnx6.out index d20df5d2..c90552e4 100644 --- a/keama/tests/nxdomainnx6.out +++ b/keama/tests/nxdomainnx6.out @@ -1,6 +1,6 @@ { # nxdomain numeric expression - # authoritative is mandatory + # empty configs are not accepted by Kea "Dhcp6": { "valid-lifetime": 1800, "client-classes": [ diff --git a/keama/tests/onxsc4.in4 b/keama/tests/onxsc4.in4 index f756463b..f62b720c 100644 --- a/keama/tests/onxsc4.in4 +++ b/keama/tests/onxsc4.in4 @@ -1,8 +1,5 @@ # on executable statement construct -# authoritative is mandatory -authoritative; - # empty configs are not accepted by Kea default-lease-time 1800; diff --git a/keama/tests/onxsc4.out b/keama/tests/onxsc4.out index aefb77cf..95134a52 100644 --- a/keama/tests/onxsc4.out +++ b/keama/tests/onxsc4.out @@ -1,6 +1,6 @@ { # on executable statement construct - # authoritative is mandatory + # empty configs are not accepted by Kea "Dhcp4": { "valid-lifetime": 1800 // # empty on statement diff --git a/keama/tests/optdatagrouppool4.in4 b/keama/tests/optdatagrouppool4.in4 index 886a279e..999abea2 100644 --- a/keama/tests/optdatagrouppool4.in4 +++ b/keama/tests/optdatagrouppool4.in4 @@ -1,8 +1,5 @@ # embedded option-data in DHCPv4 pool config -# authoritative is mandatory -authoritative; - # empty configs are not accepted by Kea default-lease-time 1800; diff --git a/keama/tests/optdatagrouppool4.out b/keama/tests/optdatagrouppool4.out index 309b0f0e..4fb102d3 100644 --- a/keama/tests/optdatagrouppool4.out +++ b/keama/tests/optdatagrouppool4.out @@ -1,6 +1,6 @@ { # embedded option-data in DHCPv4 pool config - # authoritative is mandatory + # empty configs are not accepted by Kea /// This configuration declares some subnets but has no interfaces-config /// Reference Kea #245 "Dhcp4": { diff --git a/keama/tests/optiondata4.in4 b/keama/tests/optiondata4.in4 index a194ea22..6c5ab639 100644 --- a/keama/tests/optiondata4.in4 +++ b/keama/tests/optiondata4.in4 @@ -1,8 +1,5 @@ # option data config -# authoritative is mandatory -authoritative; - # options option space foobar; diff --git a/keama/tests/optiondata4.out b/keama/tests/optiondata4.out index a904b1e7..eca745d9 100644 --- a/keama/tests/optiondata4.out +++ b/keama/tests/optiondata4.out @@ -1,9 +1,8 @@ { # option data config - # authoritative is mandatory + # options "Dhcp4": { "option-data": [ - # options { "space": "dhcp4", "name": "ip-forwarding", diff --git a/keama/tests/optiondata6.in6 b/keama/tests/optiondata6.in6 index 2b0976b6..5af5b87b 100644 --- a/keama/tests/optiondata6.in6 +++ b/keama/tests/optiondata6.in6 @@ -1,8 +1,5 @@ # option data config -# authoritative is mandatory -authoritative; - # options option space foobar; diff --git a/keama/tests/optiondata6.out b/keama/tests/optiondata6.out index 74ed8b32..b01ba36b 100644 --- a/keama/tests/optiondata6.out +++ b/keama/tests/optiondata6.out @@ -1,9 +1,8 @@ { # option data config - # authoritative is mandatory + # options "Dhcp6": { "option-def": [ - # options { "space": "foobar", "name": "fmt-f", diff --git a/keama/tests/optiondatapool4.in4 b/keama/tests/optiondatapool4.in4 index 6527a85f..58751b01 100644 --- a/keama/tests/optiondatapool4.in4 +++ b/keama/tests/optiondatapool4.in4 @@ -1,8 +1,5 @@ # option-data in DHCPv4 pool config -# authoritative is mandatory -authoritative; - # subnet declaration subnet 10.5.5.0 netmask 255.255.255.224 { # pool declaration diff --git a/keama/tests/optiondatapool4.out b/keama/tests/optiondatapool4.out index 7270d6ac..1d3ee427 100644 --- a/keama/tests/optiondatapool4.out +++ b/keama/tests/optiondatapool4.out @@ -1,11 +1,10 @@ { # option-data in DHCPv4 pool config - # authoritative is mandatory + # subnet declaration /// This configuration declares some subnets but has no interfaces-config /// Reference Kea #245 "Dhcp4": { "subnet4": [ - # subnet declaration { "id": 1, "subnet": "10.5.5.0/27", diff --git a/keama/tests/optiondatapool6.in6 b/keama/tests/optiondatapool6.in6 index 179c2f5c..d09ebaf9 100644 --- a/keama/tests/optiondatapool6.in6 +++ b/keama/tests/optiondatapool6.in6 @@ -1,8 +1,5 @@ # option-data in DHCPv6 pool config -# authoritative is mandatory -authoritative; - # subnet declaration subnet6 2001::/64 { # pool declaration diff --git a/keama/tests/optiondatapool6.out b/keama/tests/optiondatapool6.out index 4b8a7d37..48f722d4 100644 --- a/keama/tests/optiondatapool6.out +++ b/keama/tests/optiondatapool6.out @@ -1,11 +1,10 @@ { # option-data in DHCPv6 pool config - # authoritative is mandatory + # subnet declaration /// This configuration declares some subnets but has no interfaces-config /// Reference Kea #245 "Dhcp6": { "subnet6": [ - # subnet declaration { "id": 1, "subnet": "2001::/64", diff --git a/keama/tests/optiondecl4.in4 b/keama/tests/optiondecl4.in4 index 25a51ae2..4be48838 100644 --- a/keama/tests/optiondecl4.in4 +++ b/keama/tests/optiondecl4.in4 @@ -1,8 +1,5 @@ # option definition config -# authoritative is mandatory -authoritative; - # options option space foobar; diff --git a/keama/tests/optiondecl4.out b/keama/tests/optiondecl4.out index b3c4bf1a..f74aa32f 100644 --- a/keama/tests/optiondecl4.out +++ b/keama/tests/optiondecl4.out @@ -1,9 +1,8 @@ { # option definition config - # authoritative is mandatory + # options "Dhcp4": { "option-def": [ - # options { "space": "foobar", "name": "fmt-f", diff --git a/keama/tests/optiondecl6.in6 b/keama/tests/optiondecl6.in6 index 296a6114..37662c0d 100644 --- a/keama/tests/optiondecl6.in6 +++ b/keama/tests/optiondecl6.in6 @@ -1,8 +1,5 @@ # option definition config -# authoritative is mandatory -authoritative; - # options option space foobar; diff --git a/keama/tests/optiondecl6.out b/keama/tests/optiondecl6.out index 9f5640f0..d4cf828b 100644 --- a/keama/tests/optiondecl6.out +++ b/keama/tests/optiondecl6.out @@ -1,9 +1,8 @@ { # option definition config - # authoritative is mandatory + # options "Dhcp6": { "option-def": [ - # options { "space": "foobar", "name": "fmt-f", diff --git a/keama/tests/optionencap4.in4 b/keama/tests/optionencap4.in4 index 6fbe864f..f5dddfdb 100644 --- a/keama/tests/optionencap4.in4 +++ b/keama/tests/optionencap4.in4 @@ -1,8 +1,5 @@ # option definition config -# authoritative is mandatory -authoritative; - # options option space foobar; option space xyz; diff --git a/keama/tests/optionencap4.out b/keama/tests/optionencap4.out index ed869ada..ee59fc42 100644 --- a/keama/tests/optionencap4.out +++ b/keama/tests/optionencap4.out @@ -1,9 +1,8 @@ { # option definition config - # authoritative is mandatory + # options "Dhcp4": { "option-def": [ - # options { "space": "foobar", "name": "encap", diff --git a/keama/tests/optionencap6.in6 b/keama/tests/optionencap6.in6 index 6fbe864f..f5dddfdb 100644 --- a/keama/tests/optionencap6.in6 +++ b/keama/tests/optionencap6.in6 @@ -1,8 +1,5 @@ # option definition config -# authoritative is mandatory -authoritative; - # options option space foobar; option space xyz; diff --git a/keama/tests/optionencap6.out b/keama/tests/optionencap6.out index 275b7305..733fc714 100644 --- a/keama/tests/optionencap6.out +++ b/keama/tests/optionencap6.out @@ -1,9 +1,8 @@ { # option definition config - # authoritative is mandatory + # options "Dhcp6": { "option-def": [ - # options { "space": "foobar", "name": "encap", diff --git a/keama/tests/optionexpr4.in4 b/keama/tests/optionexpr4.in4 index 8dfccb97..bc0889dd 100644 --- a/keama/tests/optionexpr4.in4 +++ b/keama/tests/optionexpr4.in4 @@ -1,8 +1,5 @@ # option data expressions -# authoritative is mandatory -authoritative; - # options option mytext code 250 = text; option mytext = substring("foobar", 1, 3); diff --git a/keama/tests/optionexpr4.out b/keama/tests/optionexpr4.out index 9ea6618e..3582b3d7 100644 --- a/keama/tests/optionexpr4.out +++ b/keama/tests/optionexpr4.out @@ -1,9 +1,8 @@ { # option data expressions - # authoritative is mandatory + # options "Dhcp4": { "option-def": [ - # options { "space": "dhcp4", "name": "mytext", diff --git a/keama/tests/optionspace4.in4 b/keama/tests/optionspace4.in4 index 23223cbe..fa87b6a5 100644 --- a/keama/tests/optionspace4.in4 +++ b/keama/tests/optionspace4.in4 @@ -1,8 +1,5 @@ # group and class declaration config -# authoritative is mandatory -authoritative; - # option spaces option space foobar; diff --git a/keama/tests/optionspace4.out b/keama/tests/optionspace4.out index e6e18594..53482692 100644 --- a/keama/tests/optionspace4.out +++ b/keama/tests/optionspace4.out @@ -1,6 +1,6 @@ { # group and class declaration config - # authoritative is mandatory + # option spaces "Dhcp4": { // "option-space": { // "name": "bar", @@ -17,7 +17,6 @@ // "length-width": 2 // }, "option-def": [ - # option spaces { "space": "foobar", "name": "test", diff --git a/keama/tests/optionspace6.in6 b/keama/tests/optionspace6.in6 index f9bfb2ac..a94a665f 100644 --- a/keama/tests/optionspace6.in6 +++ b/keama/tests/optionspace6.in6 @@ -1,8 +1,5 @@ # group and class declaration config -# authoritative is mandatory -authoritative; - # option spaces option space foobar; diff --git a/keama/tests/optionspace6.out b/keama/tests/optionspace6.out index 475e60d3..fdc9ea72 100644 --- a/keama/tests/optionspace6.out +++ b/keama/tests/optionspace6.out @@ -1,6 +1,6 @@ { # group and class declaration config - # authoritative is mandatory + # option spaces "Dhcp6": { // "option-space": { // "name": "bar", @@ -17,7 +17,6 @@ // "length-width": 1 // }, "option-def": [ - # option spaces { "space": "foobar", "name": "test", diff --git a/keama/tests/optionvendor4.in4 b/keama/tests/optionvendor4.in4 index c9bb4b43..49be45d7 100644 --- a/keama/tests/optionvendor4.in4 +++ b/keama/tests/optionvendor4.in4 @@ -1,8 +1,5 @@ # group and class declaration config -# authoritative is mandatory -authoritative; - # vendor option space option space foobar; diff --git a/keama/tests/optionvendor4.out b/keama/tests/optionvendor4.out index 70c013c4..80a9a5e8 100644 --- a/keama/tests/optionvendor4.out +++ b/keama/tests/optionvendor4.out @@ -1,9 +1,8 @@ { # group and class declaration config - # authoritative is mandatory + # vendor option space "Dhcp4": { "option-def": [ - # vendor option space { "space": "vendor-12345", "name": "test", diff --git a/keama/tests/optionvendor6.in6 b/keama/tests/optionvendor6.in6 index 5bd74b95..9a1a3757 100644 --- a/keama/tests/optionvendor6.in6 +++ b/keama/tests/optionvendor6.in6 @@ -1,8 +1,5 @@ # group and class declaration config -# authoritative is mandatory -authoritative; - # vendor option space option space foobar; diff --git a/keama/tests/optionvendor6.out b/keama/tests/optionvendor6.out index 722bf6f7..8e163978 100644 --- a/keama/tests/optionvendor6.out +++ b/keama/tests/optionvendor6.out @@ -1,9 +1,8 @@ { # group and class declaration config - # authoritative is mandatory + # vendor option space "Dhcp6": { "option-def": [ - # vendor option space { "space": "vendor-12345", "name": "test", diff --git a/keama/tests/orphan4.in4 b/keama/tests/orphan4.in4 index fc9ecfcf..85f95639 100644 --- a/keama/tests/orphan4.in4 +++ b/keama/tests/orphan4.in4 @@ -1,8 +1,5 @@ # DHCPv4 orphan reservation config -# authoritative is mandatory -authoritative; - # empty configs are not accepted by Kea default-lease-time 1800; diff --git a/keama/tests/orphan4.out b/keama/tests/orphan4.out index 6663789d..c0146767 100644 --- a/keama/tests/orphan4.out +++ b/keama/tests/orphan4.out @@ -1,6 +1,6 @@ { # DHCPv4 orphan reservation config - # authoritative is mandatory + # empty configs are not accepted by Kea "Dhcp4": { "valid-lifetime": 1800, "host-reservation-identifiers": [ diff --git a/keama/tests/orphan6.in6 b/keama/tests/orphan6.in6 index ed303790..e85368f2 100644 --- a/keama/tests/orphan6.in6 +++ b/keama/tests/orphan6.in6 @@ -1,8 +1,5 @@ # DHCPv6 orphan reservation config -# authoritative is mandatory -authoritative; - # empty configs are not accepted by Kea default-lease-time 1800; diff --git a/keama/tests/orphan6.out b/keama/tests/orphan6.out index b01041f7..0c0b8114 100644 --- a/keama/tests/orphan6.out +++ b/keama/tests/orphan6.out @@ -1,6 +1,6 @@ { # DHCPv6 orphan reservation config - # authoritative is mandatory + # empty configs are not accepted by Kea "Dhcp6": { "valid-lifetime": 1800, "host-reservation-identifiers": [ diff --git a/keama/tests/permitauth4.in4 b/keama/tests/permitauth4.in4 index a1ff74aa..b9663fd2 100644 --- a/keama/tests/permitauth4.in4 +++ b/keama/tests/permitauth4.in4 @@ -1,8 +1,5 @@ # DHCPv4 permit authenticated client config -# authoritative is mandatory -authoritative; - # empty configs are not accepted by Kea default-lease-time 1800; diff --git a/keama/tests/permitauth4.out b/keama/tests/permitauth4.out index f7159774..0f938566 100644 --- a/keama/tests/permitauth4.out +++ b/keama/tests/permitauth4.out @@ -1,6 +1,6 @@ { # DHCPv4 permit authenticated client config - # authoritative is mandatory + # empty configs are not accepted by Kea /// This configuration declares some subnets but has no interfaces-config /// Reference Kea #245 "Dhcp4": { diff --git a/keama/tests/permitauth6.in6 b/keama/tests/permitauth6.in6 index ea0da051..ce0a25aa 100644 --- a/keama/tests/permitauth6.in6 +++ b/keama/tests/permitauth6.in6 @@ -1,8 +1,5 @@ # DHCPv6 permit authenticated client config -# authoritative is mandatory -authoritative; - # empty configs are not accepted by Kea default-lease-time 1800; diff --git a/keama/tests/permitauth6.out b/keama/tests/permitauth6.out index ae18c564..f2013e77 100644 --- a/keama/tests/permitauth6.out +++ b/keama/tests/permitauth6.out @@ -1,6 +1,6 @@ { # DHCPv6 permit authenticated client config - # authoritative is mandatory + # empty configs are not accepted by Kea /// This configuration declares some subnets but has no interfaces-config /// Reference Kea #245 "Dhcp6": { diff --git a/keama/tests/permitknown4.in4 b/keama/tests/permitknown4.in4 index 89784073..df15e11e 100644 --- a/keama/tests/permitknown4.in4 +++ b/keama/tests/permitknown4.in4 @@ -1,8 +1,5 @@ # DHCPv4 permit known client config -# authoritative is mandatory -authoritative; - # empty configs are not accepted by Kea default-lease-time 1800; diff --git a/keama/tests/permitknown4.out b/keama/tests/permitknown4.out index b8943e54..1a27d5a9 100644 --- a/keama/tests/permitknown4.out +++ b/keama/tests/permitknown4.out @@ -1,6 +1,6 @@ { # DHCPv4 permit known client config - # authoritative is mandatory + # empty configs are not accepted by Kea /// This configuration declares some subnets but has no interfaces-config /// Reference Kea #245 "Dhcp4": { diff --git a/keama/tests/pickdx6.in6 b/keama/tests/pickdx6.in6 index 6b4db826..ccfa48ce 100644 --- a/keama/tests/pickdx6.in6 +++ b/keama/tests/pickdx6.in6 @@ -1,8 +1,5 @@ # pick-first-value data expression -# authoritative is mandatory -authoritative; - # empty configs are not accepted by Kea default-lease-time 1800; diff --git a/keama/tests/pickdx6.out b/keama/tests/pickdx6.out index f7e727c4..d8de1130 100644 --- a/keama/tests/pickdx6.out +++ b/keama/tests/pickdx6.out @@ -1,6 +1,6 @@ { # pick-first-value data expression - # authoritative is mandatory + # empty configs are not accepted by Kea "Dhcp6": { "valid-lifetime": 1800, "client-classes": [ diff --git a/keama/tests/pool4.in4 b/keama/tests/pool4.in4 index db8bc59e..0e156141 100644 --- a/keama/tests/pool4.in4 +++ b/keama/tests/pool4.in4 @@ -1,8 +1,5 @@ # DHCPv4 pool config -# authoritative is mandatory -authoritative; - # subnet declaration subnet 10.5.5.0 netmask 255.255.255.224 { # pool declaration diff --git a/keama/tests/pool4.out b/keama/tests/pool4.out index b9f4634a..6a0f98cc 100644 --- a/keama/tests/pool4.out +++ b/keama/tests/pool4.out @@ -1,11 +1,10 @@ { # DHCPv4 pool config - # authoritative is mandatory + # subnet declaration /// This configuration declares some subnets but has no interfaces-config /// Reference Kea #245 "Dhcp4": { "subnet4": [ - # subnet declaration { "id": 1, "subnet": "10.5.5.0/27", diff --git a/keama/tests/pool42.in4 b/keama/tests/pool42.in4 index 07d05b3e..7e7fea3f 100644 --- a/keama/tests/pool42.in4 +++ b/keama/tests/pool42.in4 @@ -1,8 +1,5 @@ # DHCPv4 pool with 2 ranges config -# authoritative is mandatory -authoritative; - # subnet declaration subnet 10.5.5.0 netmask 255.255.255.224 { # pool declaration diff --git a/keama/tests/pool42.out b/keama/tests/pool42.out index 087f0f8b..74c9c063 100644 --- a/keama/tests/pool42.out +++ b/keama/tests/pool42.out @@ -1,9 +1,8 @@ { # DHCPv4 pool with 2 ranges config - # authoritative is mandatory + # subnet declaration "Dhcp4": { "subnet4": [ - # subnet declaration { "id": 1, "subnet": "10.5.5.0/27", diff --git a/keama/tests/pool6.in6 b/keama/tests/pool6.in6 index 70c9c709..2cd2fa39 100644 --- a/keama/tests/pool6.in6 +++ b/keama/tests/pool6.in6 @@ -1,8 +1,5 @@ # DHCPv6 pool config -# authoritative is mandatory -authoritative; - # subnet declaration subnet6 2001::/64 { # pool declaration diff --git a/keama/tests/pool6.out b/keama/tests/pool6.out index 22065a87..b7cbb69e 100644 --- a/keama/tests/pool6.out +++ b/keama/tests/pool6.out @@ -1,11 +1,10 @@ { # DHCPv6 pool config - # authoritative is mandatory + # subnet declaration /// This configuration declares some subnets but has no interfaces-config /// Reference Kea #245 "Dhcp6": { "subnet6": [ - # subnet declaration { "id": 1, "subnet": "2001::/64", diff --git a/keama/tests/preferred6.in6 b/keama/tests/preferred6.in6 index a6a53c00..9fd8519f 100644 --- a/keama/tests/preferred6.in6 +++ b/keama/tests/preferred6.in6 @@ -1,8 +1,5 @@ # preferred lifetime -# authoritative is mandatory -authoritative; - preferred-lifetime 1200; # embedded in pool diff --git a/keama/tests/preferred6.out b/keama/tests/preferred6.out index 8a7ded92..88acf33d 100644 --- a/keama/tests/preferred6.out +++ b/keama/tests/preferred6.out @@ -1,6 +1,5 @@ { # preferred lifetime - # authoritative is mandatory /// This configuration declares some subnets but has no interfaces-config /// Reference Kea #245 "Dhcp6": { diff --git a/keama/tests/prefix6.in6 b/keama/tests/prefix6.in6 index 78e1f399..e5c01c90 100644 --- a/keama/tests/prefix6.in6 +++ b/keama/tests/prefix6.in6 @@ -1,8 +1,5 @@ # DHCPv6 prefix config -# authoritative is mandatory -authoritative; - # subnet declaration subnet6 2001::/64 { # range declaration diff --git a/keama/tests/prefix6.out b/keama/tests/prefix6.out index f3fd5a30..e0fe3ea5 100644 --- a/keama/tests/prefix6.out +++ b/keama/tests/prefix6.out @@ -1,11 +1,10 @@ { # DHCPv6 prefix config - # authoritative is mandatory + # subnet declaration /// This configuration declares some subnets but has no interfaces-config /// Reference Kea #245 "Dhcp6": { "subnet6": [ - # subnet declaration { "id": 1, "subnet": "2001::/64", diff --git a/keama/tests/prefix62.in6 b/keama/tests/prefix62.in6 index 8050b51c..408481a5 100644 --- a/keama/tests/prefix62.in6 +++ b/keama/tests/prefix62.in6 @@ -1,8 +1,5 @@ # DHCPv6 prefix config -# authoritative is mandatory -authoritative; - # subnet declaration subnet6 2001::/64 { # range declaration diff --git a/keama/tests/prefix62.out b/keama/tests/prefix62.out index b693300a..0ce536a8 100644 --- a/keama/tests/prefix62.out +++ b/keama/tests/prefix62.out @@ -1,9 +1,8 @@ { # DHCPv6 prefix config - # authoritative is mandatory + # subnet declaration "Dhcp6": { "subnet6": [ - # subnet declaration { "id": 1, "subnet": "2001::/64", diff --git a/keama/tests/qualifyingsuffix4.in4 b/keama/tests/qualifyingsuffix4.in4 index b2d1e614..cef53f4d 100644 --- a/keama/tests/qualifyingsuffix4.in4 +++ b/keama/tests/qualifyingsuffix4.in4 @@ -1,8 +1,5 @@ # ddns-domainname (aka qualifying-suffix) -# authoritative is mandatory -authoritative; - ddns-domainname ".biz"; ddns-updates true; diff --git a/keama/tests/qualifyingsuffix4.out b/keama/tests/qualifyingsuffix4.out index 56682cec..f014362d 100644 --- a/keama/tests/qualifyingsuffix4.out +++ b/keama/tests/qualifyingsuffix4.out @@ -1,6 +1,5 @@ { # ddns-domainname (aka qualifying-suffix) - # authoritative is mandatory "Dhcp4": { "dhcp-ddns": { "qualifying-suffix": ".biz", diff --git a/keama/tests/qualifyingsuffix6.in6 b/keama/tests/qualifyingsuffix6.in6 index 34781db9..3957eae2 100644 --- a/keama/tests/qualifyingsuffix6.in6 +++ b/keama/tests/qualifyingsuffix6.in6 @@ -1,8 +1,5 @@ # ddns-domainname (aka qualifying-suffix) -# authoritative is mandatory -authoritative; - ddns-domainname ".biz"; # embedded diff --git a/keama/tests/qualifyingsuffix6.out b/keama/tests/qualifyingsuffix6.out index b89534b6..44ae84a1 100644 --- a/keama/tests/qualifyingsuffix6.out +++ b/keama/tests/qualifyingsuffix6.out @@ -1,6 +1,5 @@ { # ddns-domainname (aka qualifying-suffix) - # authoritative is mandatory "Dhcp6": { "dhcp-ddns": { "enable-updates": false, diff --git a/keama/tests/range4.in4 b/keama/tests/range4.in4 index 57af6f2c..f755a2eb 100644 --- a/keama/tests/range4.in4 +++ b/keama/tests/range4.in4 @@ -1,8 +1,5 @@ # DHCPv4 range config -# authoritative is mandatory -authoritative; - # subnet declaration subnet 10.5.5.0 netmask 255.255.255.224 { # range declaration diff --git a/keama/tests/range4.out b/keama/tests/range4.out index c2685fd6..94611f7e 100644 --- a/keama/tests/range4.out +++ b/keama/tests/range4.out @@ -1,11 +1,10 @@ { # DHCPv4 range config - # authoritative is mandatory + # subnet declaration /// This configuration declares some subnets but has no interfaces-config /// Reference Kea #245 "Dhcp4": { "subnet4": [ - # subnet declaration { "id": 1, "subnet": "10.5.5.0/27", diff --git a/keama/tests/range6.in6 b/keama/tests/range6.in6 index 349555f4..45a0635a 100644 --- a/keama/tests/range6.in6 +++ b/keama/tests/range6.in6 @@ -1,8 +1,5 @@ # DHCPv6 range config -# authoritative is mandatory -authoritative; - # subnet declaration subnet6 2001::/64 { # range declaration diff --git a/keama/tests/range6.out b/keama/tests/range6.out index d1b3bbd8..1e506ab5 100644 --- a/keama/tests/range6.out +++ b/keama/tests/range6.out @@ -1,9 +1,8 @@ { # DHCPv6 range config - # authoritative is mandatory + # subnet declaration "Dhcp6": { "subnet6": [ - # subnet declaration { "id": 1, "subnet": "2001::/64", diff --git a/keama/tests/reversedx6.in6 b/keama/tests/reversedx6.in6 index 7abdc31f..ba762787 100644 --- a/keama/tests/reversedx6.in6 +++ b/keama/tests/reversedx6.in6 @@ -1,8 +1,5 @@ # reverse data expression -# authoritative is mandatory -authoritative; - # empty configs are not accepted by Kea default-lease-time 1800; diff --git a/keama/tests/reversedx6.out b/keama/tests/reversedx6.out index 4edf6635..f13efe95 100644 --- a/keama/tests/reversedx6.out +++ b/keama/tests/reversedx6.out @@ -1,6 +1,6 @@ { # reverse data expression - # authoritative is mandatory + # empty configs are not accepted by Kea "Dhcp6": { "valid-lifetime": 1800, "client-classes": [ diff --git a/keama/tests/samples/example.conf b/keama/tests/samples/example.conf index fdfb2295..62b088dc 100644 --- a/keama/tests/samples/example.conf +++ b/keama/tests/samples/example.conf @@ -3,9 +3,6 @@ # Sample configuration file for ISC dhcpd # -# Required -authoritative; - # option definitions common to all supported networks... option domain-name "example.org"; #option domain-name-servers ns1.example.org, ns2.example.org; diff --git a/keama/tests/samples/example.json b/keama/tests/samples/example.json index a9943e7a..26b619bb 100644 --- a/keama/tests/samples/example.json +++ b/keama/tests/samples/example.json @@ -3,12 +3,11 @@ # # Sample configuration file for ISC dhcpd # - # Required + # option definitions common to all supported networks... /// This configuration declares some subnets but has no interfaces-config /// Reference Kea #245 "Dhcp4": { "option-data": [ - # option definitions common to all supported networks... { "space": "dhcp4", "name": "domain-name", diff --git a/keama/tests/samples/simple.json b/keama/tests/samples/simple.json index cebb7133..a3cb1efc 100644 --- a/keama/tests/samples/simple.json +++ b/keama/tests/samples/simple.json @@ -27,6 +27,9 @@ // "value": 7200 // } // ], + # We're going to be authoritative for the network we've + # just created. + "authoritative": true, "subnet4": [ # No service will be given on this subnet, but we're telling # the DHCP server about it so it understands it's there and diff --git a/keama/tests/samples/test-a6.conf b/keama/tests/samples/test-a6.conf index f499c072..9514c4aa 100644 --- a/keama/tests/samples/test-a6.conf +++ b/keama/tests/samples/test-a6.conf @@ -1,4 +1,3 @@ -authoritative; # # Define the DHCPv6 option space. # diff --git a/keama/tests/samples/test-a6.json b/keama/tests/samples/test-a6.json index 5b6ecab4..8b768686 100644 --- a/keama/tests/samples/test-a6.json +++ b/keama/tests/samples/test-a6.json @@ -1,14 +1,14 @@ { + # + # Define the DHCPv6 option space. + # + # Option numbers are assigned by IANA: + # http://www.iana.org/assignments/dhcpv6-parameters + # /// This configuration declares some subnets but has no interfaces-config /// Reference Kea #245 "Dhcp6": { "option-def": [ - # - # Define the DHCPv6 option space. - # - # Option numbers are assigned by IANA: - # http://www.iana.org/assignments/dhcpv6-parameters - # { "space": "dhcp6", "name": "time-servers", diff --git a/keama/tests/samples/vmnet8.conf b/keama/tests/samples/vmnet8.conf index e11b5153..9484938e 100644 --- a/keama/tests/samples/vmnet8.conf +++ b/keama/tests/samples/vmnet8.conf @@ -8,7 +8,6 @@ # We also supply a domain name to make pump (Red Hat 6.x) happy. # -authoritative; ###### VMNET DHCP Configuration. Start of "DO NOT MODIFY SECTION" ##### # Modification Instructions: This section of the configuration file contains diff --git a/keama/tests/samples/vmnet8.json b/keama/tests/samples/vmnet8.json index 132c5a96..5624319e 100644 --- a/keama/tests/samples/vmnet8.json +++ b/keama/tests/samples/vmnet8.json @@ -8,18 +8,18 @@ # (dhclient as configured in SuSE, TurboLinux, etc.). # We also supply a domain name to make pump (Red Hat 6.x) happy. # + ###### VMNET DHCP Configuration. Start of "DO NOT MODIFY SECTION" ##### + # Modification Instructions: This section of the configuration file contains + # information generated by the configuration program. Do not modify this + # section. + # You are free to modify everything else. Also, this section must start + # on a new line + # This file will get backed up with a different name in the same directory + # if this section is edited and you try to configure DHCP again. + # Written at: 04/12/2017 14:00:17 /// This configuration declares some subnets but has no interfaces-config /// Reference Kea #245 "Dhcp4": { -// ###### VMNET DHCP Configuration. Start of "DO NOT MODIFY SECTION" ##### -// # Modification Instructions: This section of the configuration file contains -// # information generated by the configuration program. Do not modify this -// # section. -// # You are free to modify everything else. Also, this section must start -// # on a new line -// # This file will get backed up with a different name in the same directory -// # if this section is edited and you try to configure DHCP again. -// # Written at: 04/12/2017 14:00:17 // "statement": { // "config": { // "value": "allow", diff --git a/keama/tests/shareone4.in4 b/keama/tests/shareone4.in4 index 1987b9bc..ef0e15ac 100644 --- a/keama/tests/shareone4.in4 +++ b/keama/tests/shareone4.in4 @@ -1,8 +1,5 @@ # DHCPv4 one-subnet shared-network declaration config -# authoritative is mandatory -authoritative; - # shared-network declaration shared-network "foobar" { # interface diff --git a/keama/tests/shareone4.out b/keama/tests/shareone4.out index a8db65e8..56f5cbb7 100644 --- a/keama/tests/shareone4.out +++ b/keama/tests/shareone4.out @@ -1,6 +1,6 @@ { # DHCPv4 one-subnet shared-network declaration config - # authoritative is mandatory + # shared-network declaration "Dhcp4": { "interfaces-config": { "interfaces": [ diff --git a/keama/tests/shareone6.in6 b/keama/tests/shareone6.in6 index d16ff8e1..11b03cb0 100644 --- a/keama/tests/shareone6.in6 +++ b/keama/tests/shareone6.in6 @@ -1,8 +1,5 @@ # DHCPv6 one-subnet shared-network declaration config -# authoritative is mandatory -authoritative; - # shared-network declaration shared-network "foobar" { # interface diff --git a/keama/tests/shareone6.out b/keama/tests/shareone6.out index ea4a4c81..6f8389c3 100644 --- a/keama/tests/shareone6.out +++ b/keama/tests/shareone6.out @@ -1,6 +1,6 @@ { # DHCPv6 one-subnet shared-network declaration config - # authoritative is mandatory + # shared-network declaration "Dhcp6": { "interfaces-config": { "interfaces": [ diff --git a/keama/tests/sharepools4.in4 b/keama/tests/sharepools4.in4 index 280c010d..b42a8481 100644 --- a/keama/tests/sharepools4.in4 +++ b/keama/tests/sharepools4.in4 @@ -1,8 +1,5 @@ # DHCPv4 two pools and subnets shared-network declaration config -# authoritative is mandatory -authoritative; - # shared-network declaration shared-network "foobar" { # interface diff --git a/keama/tests/sharepools4.out b/keama/tests/sharepools4.out index 6e64d345..087ec5c8 100644 --- a/keama/tests/sharepools4.out +++ b/keama/tests/sharepools4.out @@ -1,6 +1,6 @@ { # DHCPv4 two pools and subnets shared-network declaration config - # authoritative is mandatory + # shared-network declaration "Dhcp4": { "interfaces-config": { "interfaces": [ @@ -9,7 +9,6 @@ }, /// Kea shared-networks are different, cf Kea #236 "shared-networks": [ - # shared-network declaration { "name": "foobar", "subnet4": [ diff --git a/keama/tests/sharetwo4.in4 b/keama/tests/sharetwo4.in4 index 210d95d8..fa9126fe 100644 --- a/keama/tests/sharetwo4.in4 +++ b/keama/tests/sharetwo4.in4 @@ -1,8 +1,5 @@ # DHCPv4 two subnets in shared-network declaration config -# authoritative is mandatory -authoritative; - # shared-network declaration shared-network "foobar" { # interface diff --git a/keama/tests/sharetwo4.out b/keama/tests/sharetwo4.out index 7bc57f31..71f7832e 100644 --- a/keama/tests/sharetwo4.out +++ b/keama/tests/sharetwo4.out @@ -1,6 +1,6 @@ { # DHCPv4 two subnets in shared-network declaration config - # authoritative is mandatory + # shared-network declaration "Dhcp4": { "interfaces-config": { "interfaces": [ @@ -9,7 +9,6 @@ }, /// Kea shared-networks are different, cf Kea #236 "shared-networks": [ - # shared-network declaration { "name": "foobar", "subnet4": [ diff --git a/keama/tests/sharetwo6.in6 b/keama/tests/sharetwo6.in6 index b61f7936..3c75aad5 100644 --- a/keama/tests/sharetwo6.in6 +++ b/keama/tests/sharetwo6.in6 @@ -1,8 +1,5 @@ # DHCPv6 two subnets in shared-network declaration config -# authoritative is mandatory -authoritative; - # shared-network declaration shared-network "foobar" { # interface diff --git a/keama/tests/sharetwo6.out b/keama/tests/sharetwo6.out index 41c7d149..23df4e7c 100644 --- a/keama/tests/sharetwo6.out +++ b/keama/tests/sharetwo6.out @@ -1,6 +1,6 @@ { # DHCPv6 two subnets in shared-network declaration config - # authoritative is mandatory + # shared-network declaration "Dhcp6": { "interfaces-config": { "interfaces": [ @@ -9,7 +9,6 @@ }, /// Kea shared-networks are different, cf Kea #236 "shared-networks": [ - # shared-network declaration { "name": "foobar", "subnet6": [ diff --git a/keama/tests/spawning6.in6 b/keama/tests/spawning6.in6 index bfe60891..0c33afe1 100644 --- a/keama/tests/spawning6.in6 +++ b/keama/tests/spawning6.in6 @@ -1,8 +1,5 @@ # spawning declaration config -# authoritative is mandatory -authoritative; - # options option dhcp6.mysystem code 1250 = text; option dhcp6.myversion code 1251 = unsigned integer 16; diff --git a/keama/tests/spawning6.out b/keama/tests/spawning6.out index c21a7018..ce556d80 100644 --- a/keama/tests/spawning6.out +++ b/keama/tests/spawning6.out @@ -1,9 +1,8 @@ { # spawning declaration config - # authoritative is mandatory + # options "Dhcp6": { "option-def": [ - # options { "space": "dhcp6", "name": "mysystem", diff --git a/keama/tests/subclass4.in4 b/keama/tests/subclass4.in4 index e3991d32..bdae6632 100644 --- a/keama/tests/subclass4.in4 +++ b/keama/tests/subclass4.in4 @@ -1,8 +1,5 @@ # subclass declaration config -# authoritative is mandatory -authoritative; - # options option mysystem code 250 = text; option myversion code 251 = unsigned integer 16; diff --git a/keama/tests/subclass4.out b/keama/tests/subclass4.out index c3946da5..e155d0de 100644 --- a/keama/tests/subclass4.out +++ b/keama/tests/subclass4.out @@ -1,9 +1,8 @@ { # subclass declaration config - # authoritative is mandatory + # options "Dhcp4": { "option-def": [ - # options { "space": "dhcp4", "name": "mysystem", diff --git a/keama/tests/subclass6.in6 b/keama/tests/subclass6.in6 index 30b2c2ee..41408180 100644 --- a/keama/tests/subclass6.in6 +++ b/keama/tests/subclass6.in6 @@ -1,8 +1,5 @@ # subclass declaration config -# authoritative is mandatory -authoritative; - # options option dhcp6.mysystem code 1250 = text; option dhcp6.myversion code 1251 = unsigned integer 16; diff --git a/keama/tests/subclass6.out b/keama/tests/subclass6.out index fb2fe531..3828d58d 100644 --- a/keama/tests/subclass6.out +++ b/keama/tests/subclass6.out @@ -1,9 +1,8 @@ { # subclass declaration config - # authoritative is mandatory + # options "Dhcp6": { "option-def": [ - # options { "space": "dhcp6", "name": "mysystem", diff --git a/keama/tests/subclassbinsel4.in4 b/keama/tests/subclassbinsel4.in4 index efc97b5a..95d5aa54 100644 --- a/keama/tests/subclassbinsel4.in4 +++ b/keama/tests/subclassbinsel4.in4 @@ -1,8 +1,5 @@ # subclass declaration config -# authoritative is mandatory -authoritative; - # options option myversion code 251 = unsigned integer 16; diff --git a/keama/tests/subclassbinsel4.out b/keama/tests/subclassbinsel4.out index 5caecbe2..589afcb8 100644 --- a/keama/tests/subclassbinsel4.out +++ b/keama/tests/subclassbinsel4.out @@ -1,9 +1,8 @@ { # subclass declaration config - # authoritative is mandatory + # options "Dhcp4": { "option-def": [ - # options { "space": "dhcp4", "name": "myversion", diff --git a/keama/tests/subclassbinsel6.in6 b/keama/tests/subclassbinsel6.in6 index aed61a67..0a7e36d7 100644 --- a/keama/tests/subclassbinsel6.in6 +++ b/keama/tests/subclassbinsel6.in6 @@ -1,8 +1,5 @@ # subclass declaration config -# authoritative is mandatory -authoritative; - # options option dhcp6.hardware code 1250 = string; option dhcp6.myversion code 1251 = unsigned integer 16; diff --git a/keama/tests/subclassbinsel6.out b/keama/tests/subclassbinsel6.out index 248a5ac3..42c96bb2 100644 --- a/keama/tests/subclassbinsel6.out +++ b/keama/tests/subclassbinsel6.out @@ -1,9 +1,8 @@ { # subclass declaration config - # authoritative is mandatory + # options "Dhcp6": { "option-def": [ - # options { "space": "dhcp6", "name": "hardware", diff --git a/keama/tests/subclassguard4.in4 b/keama/tests/subclassguard4.in4 index 500f9408..9a22d356 100644 --- a/keama/tests/subclassguard4.in4 +++ b/keama/tests/subclassguard4.in4 @@ -1,8 +1,5 @@ # subclass with guard declaration config -# authoritative is mandatory -authoritative; - # options option mysystem code 250 = text; option myversion code 251 = unsigned integer 16; diff --git a/keama/tests/subclassguard4.out b/keama/tests/subclassguard4.out index 49979131..910b5b93 100644 --- a/keama/tests/subclassguard4.out +++ b/keama/tests/subclassguard4.out @@ -1,9 +1,8 @@ { # subclass with guard declaration config - # authoritative is mandatory + # options "Dhcp4": { "option-def": [ - # options { "space": "dhcp4", "name": "mysystem", diff --git a/keama/tests/subclassguard6.in6 b/keama/tests/subclassguard6.in6 index 51b6e28a..5c2119a6 100644 --- a/keama/tests/subclassguard6.in6 +++ b/keama/tests/subclassguard6.in6 @@ -1,8 +1,5 @@ # subclass with guard declaration config -# authoritative is mandatory -authoritative; - # options option dhcp6.mysystem code 1250 = text; option dhcp6.myversion code 1251 = unsigned integer 16; diff --git a/keama/tests/subclassguard6.out b/keama/tests/subclassguard6.out index 11387123..26a9d4dc 100644 --- a/keama/tests/subclassguard6.out +++ b/keama/tests/subclassguard6.out @@ -1,9 +1,8 @@ { # subclass with guard declaration config - # authoritative is mandatory + # options "Dhcp6": { "option-def": [ - # options { "space": "dhcp6", "name": "mysystem", diff --git a/keama/tests/subnet4.in4 b/keama/tests/subnet4.in4 index c19a275b..9c9247a4 100644 --- a/keama/tests/subnet4.in4 +++ b/keama/tests/subnet4.in4 @@ -1,8 +1,5 @@ # DHCPv4 subnet declaration config -# authoritative is mandatory -authoritative; - # parameter which will be changed in subnet default-lease-time 1800; diff --git a/keama/tests/subnet4.out b/keama/tests/subnet4.out index bb1f3d9b..2b50c272 100644 --- a/keama/tests/subnet4.out +++ b/keama/tests/subnet4.out @@ -1,6 +1,6 @@ { # DHCPv4 subnet declaration config - # authoritative is mandatory + # parameter which will be changed in subnet /// This configuration declares some subnets but has no interfaces-config /// Reference Kea #245 "Dhcp4": { diff --git a/keama/tests/subnet4auth.in4 b/keama/tests/subnet4auth.in4 index 1b78f58a..dd7750d7 100644 --- a/keama/tests/subnet4auth.in4 +++ b/keama/tests/subnet4auth.in4 @@ -1,8 +1,5 @@ # DHCPv4 subnet declaration config -# authoritative is mandatory -not authoritative; - # parameter which will be changed in subnet default-lease-time 1800; diff --git a/keama/tests/subnet4auth.out b/keama/tests/subnet4auth.out index bb1f3d9b..ad605779 100644 --- a/keama/tests/subnet4auth.out +++ b/keama/tests/subnet4auth.out @@ -1,6 +1,6 @@ { # DHCPv4 subnet declaration config - # authoritative is mandatory + # parameter which will be changed in subnet /// This configuration declares some subnets but has no interfaces-config /// Reference Kea #245 "Dhcp4": { @@ -16,6 +16,8 @@ "pool": "10.5.5.5 - 10.5.5.10" } ], + # authorize here + "authoritative": true, "option-data": [ { "space": "dhcp4", diff --git a/keama/tests/subnet4noauth.in4 b/keama/tests/subnet4noauth.in4 deleted file mode 100644 index 2a1cc5ef..00000000 --- a/keama/tests/subnet4noauth.in4 +++ /dev/null @@ -1,20 +0,0 @@ -# DHCPv4 subnet declaration config - -# authoritative is mandatory -not authoritative; - -# parameter which will be changed in subnet -default-lease-time 1800; - -# DHCPv4 subnet declaration -subnet 10.5.5.0 netmask 255.255.255.224 { - # at least one pool is required - pool { - range 10.5.5.5 10.5.5.10; - } - option domain-search "example.com", "example.org"; - default-lease-time 3600; - interface "en0"; - ignore-client-uids false; -} - diff --git a/keama/tests/subnet4noauth.out b/keama/tests/subnet4noauth.out deleted file mode 100644 index d8907ce6..00000000 --- a/keama/tests/subnet4noauth.out +++ /dev/null @@ -1,40 +0,0 @@ -{ - # DHCPv4 subnet declaration config - # authoritative is mandatory - "Dhcp4": { - "valid-lifetime": 1800, - "subnet4": [ -// # DHCPv4 subnet declaration -// /// Not authorized subnet -// /// This feature is not supported by Kea -// /// Skipping the subnet only partially simulates it -// { -// "id": 1, -// "subnet": "10.5.5.0/27", -// "pools": [ -// # at least one pool is required -// { -// "pool": "10.5.5.5 - 10.5.5.10" -// } -// ], -// "option-data": [ -// { -// "space": "dhcp4", -// "name": "domain-search", -// "code": 119, -// "original-data": "\"example.com\", \"example.org\"", -// "data": "example.com, example.org" -// } -// ], -// "valid-lifetime": 3600, -// "interface": "en0", -// "match-client-id": true -// } - ], - "interfaces-config": { - "interfaces": [ - "en0" - ] - } - } -} diff --git a/keama/tests/subnet6.in6 b/keama/tests/subnet6.in6 index 7966d067..ec834fd3 100644 --- a/keama/tests/subnet6.in6 +++ b/keama/tests/subnet6.in6 @@ -1,8 +1,5 @@ # DHCPv6 subnet declaration config -# authoritative is mandatory -authoritative; - # parameter which will be changed in subnet default-lease-time 1800; diff --git a/keama/tests/subnet6.out b/keama/tests/subnet6.out index 8713a550..f3535931 100644 --- a/keama/tests/subnet6.out +++ b/keama/tests/subnet6.out @@ -1,6 +1,6 @@ { # DHCPv6 subnet declaration config - # authoritative is mandatory + # parameter which will be changed in subnet /// This configuration declares some subnets but has no interfaces-config /// Reference Kea #245 "Dhcp6": { diff --git a/keama/tests/subnet6auth.in6 b/keama/tests/subnet6auth.in6 index 22ef0f1c..a41ff6f4 100644 --- a/keama/tests/subnet6auth.in6 +++ b/keama/tests/subnet6auth.in6 @@ -1,8 +1,5 @@ # DHCPv6 subnet declaration config -# authoritative is mandatory -not authoritative; - # parameter which will be changed in subnet default-lease-time 1800; diff --git a/keama/tests/subnet6auth.out b/keama/tests/subnet6auth.out index b4c639b3..aa79d1df 100644 --- a/keama/tests/subnet6auth.out +++ b/keama/tests/subnet6auth.out @@ -1,6 +1,6 @@ { # DHCPv6 subnet declaration config - # authoritative is mandatory + # parameter which will be changed in subnet "Dhcp6": { "valid-lifetime": 1800, "subnet6": [ @@ -15,6 +15,7 @@ } ], "option-data": [ + # authorize here { "space": "dhcp6", "name": "domain-search", diff --git a/keama/tests/subnet6multi.in6 b/keama/tests/subnet6multi.in6 index cc8cf8e7..a9974ba0 100644 --- a/keama/tests/subnet6multi.in6 +++ b/keama/tests/subnet6multi.in6 @@ -1,8 +1,5 @@ # DHCPv6 subnet declaration config -# authoritative is mandatory -authoritative; - # parameter which will be changed in subnet default-lease-time 1800; diff --git a/keama/tests/subnet6multi.out b/keama/tests/subnet6multi.out index 9a4773db..9a4defb6 100644 --- a/keama/tests/subnet6multi.out +++ b/keama/tests/subnet6multi.out @@ -1,6 +1,6 @@ { # DHCPv6 subnet declaration config - # authoritative is mandatory + # parameter which will be changed in subnet /// This configuration declares some subnets but has no interfaces-config /// Reference Kea #245 "Dhcp6": { diff --git a/keama/tests/subnet6noauth.in6 b/keama/tests/subnet6noauth.in6 deleted file mode 100644 index d29869b0..00000000 --- a/keama/tests/subnet6noauth.in6 +++ /dev/null @@ -1,21 +0,0 @@ -# DHCPv6 subnet declaration config - -# authoritative is mandatory -not authoritative; - -# parameter which will be changed in subnet -default-lease-time 1800; - -# DHCPv4 subnet declaration -subnet6 2001::/64 { - # at least one pool is required - pool6 { - range6 2001::100 2001::200; - } - option dhcp6.domain-search "example.com", "example.org"; - default-lease-time 3600; - pool6 { - prefix6 2001:0:0:10:: 2001:0:0:1f:: /64; - } -} - diff --git a/keama/tests/subnet6noauth.out b/keama/tests/subnet6noauth.out deleted file mode 100644 index bb39cf87..00000000 --- a/keama/tests/subnet6noauth.out +++ /dev/null @@ -1,42 +0,0 @@ -{ - # DHCPv6 subnet declaration config - # authoritative is mandatory - /// This configuration declares some subnets but has no interfaces-config - /// Reference Kea #245 - "Dhcp6": { - "valid-lifetime": 1800, - "subnet6": [ -// # DHCPv4 subnet declaration -// /// Not authorized subnet -// /// This feature is not supported by Kea -// /// Skipping the subnet only partially simulates it -// { -// "id": 1, -// "subnet": "2001::/64", -// "pools": [ -// # at least one pool is required -// { -// "pool": "2001::100 - 2001::200" -// } -// ], -// "option-data": [ -// { -// "space": "dhcp6", -// "name": "domain-search", -// "code": 24, -// "original-data": "\"example.com\", \"example.org\"", -// "data": "example.com, example.org" -// } -// ], -// "valid-lifetime": 3600, -// "pd-pools": [ -// { -// "prefix": "2001:0:0:10::", -// "delegated-len": 64, -// "prefix-len": 60 -// } -// ] -// } - ] - } -} diff --git a/keama/tests/subnet6one.in6 b/keama/tests/subnet6one.in6 index ec43da21..7c0c3a0b 100644 --- a/keama/tests/subnet6one.in6 +++ b/keama/tests/subnet6one.in6 @@ -1,8 +1,5 @@ # DHCPv6 subnet declaration config -# authoritative is mandatory -authoritative; - # parameter which will be changed in subnet default-lease-time 1800; diff --git a/keama/tests/subnet6one.out b/keama/tests/subnet6one.out index 2a433ad5..e1388c81 100644 --- a/keama/tests/subnet6one.out +++ b/keama/tests/subnet6one.out @@ -1,6 +1,6 @@ { # DHCPv6 subnet declaration config - # authoritative is mandatory + # parameter which will be changed in subnet "Dhcp6": { "valid-lifetime": 1800, "subnet6": [ diff --git a/keama/tests/substringdx4.in4 b/keama/tests/substringdx4.in4 index c9ca1f19..ed0c9d35 100644 --- a/keama/tests/substringdx4.in4 +++ b/keama/tests/substringdx4.in4 @@ -1,8 +1,5 @@ # substring data expression -# authoritative is mandatory -authoritative; - # empty configs are not accepted by Kea default-lease-time 1800; diff --git a/keama/tests/substringdx4.out b/keama/tests/substringdx4.out index dea2dc8c..75865424 100644 --- a/keama/tests/substringdx4.out +++ b/keama/tests/substringdx4.out @@ -1,6 +1,6 @@ { # substring data expression - # authoritative is mandatory + # empty configs are not accepted by Kea "Dhcp4": { "valid-lifetime": 1800, "client-classes": [ diff --git a/keama/tests/suffixdx4.in4 b/keama/tests/suffixdx4.in4 index a637a321..fc692d10 100644 --- a/keama/tests/suffixdx4.in4 +++ b/keama/tests/suffixdx4.in4 @@ -1,9 +1,6 @@ # suffix data expression # in fact ISC DHCP suffix can be reduced into Kea substring -# authoritative is mandatory -authoritative; - # empty configs are not accepted by Kea default-lease-time 1800; diff --git a/keama/tests/suffixdx4.out b/keama/tests/suffixdx4.out index 70bd2231..12f045d6 100644 --- a/keama/tests/suffixdx4.out +++ b/keama/tests/suffixdx4.out @@ -1,7 +1,7 @@ { # suffix data expression # in fact ISC DHCP suffix can be reduced into Kea substring - # authoritative is mandatory + # empty configs are not accepted by Kea "Dhcp4": { "valid-lifetime": 1800, "client-classes": [ diff --git a/keama/tests/switchxsc4.in4 b/keama/tests/switchxsc4.in4 index 14481f93..7ef6f2f3 100644 --- a/keama/tests/switchxsc4.in4 +++ b/keama/tests/switchxsc4.in4 @@ -1,8 +1,5 @@ # switch executable statement construct -# authoritative is mandatory -authoritative; - # empty configs are not accepted by Kea default-lease-time 1800; diff --git a/keama/tests/switchxsc4.out b/keama/tests/switchxsc4.out index fbab6a92..e45421d3 100644 --- a/keama/tests/switchxsc4.out +++ b/keama/tests/switchxsc4.out @@ -1,6 +1,6 @@ { # switch executable statement construct - # authoritative is mandatory + # empty configs are not accepted by Kea "Dhcp4": { "valid-lifetime": 1800 // # a switch diff --git a/keama/tests/switchxsc6.in6 b/keama/tests/switchxsc6.in6 index 166e5bc7..a9c74f86 100644 --- a/keama/tests/switchxsc6.in6 +++ b/keama/tests/switchxsc6.in6 @@ -1,8 +1,5 @@ # switch executable statement construct -# authoritative is mandatory -authoritative; - # empty configs are not accepted by Kea default-lease-time 1800; diff --git a/keama/tests/switchxsc6.out b/keama/tests/switchxsc6.out index 2a76f3b0..b7fbd06c 100644 --- a/keama/tests/switchxsc6.out +++ b/keama/tests/switchxsc6.out @@ -1,6 +1,6 @@ { # switch executable statement construct - # authoritative is mandatory + # empty configs are not accepted by Kea "Dhcp6": { "valid-lifetime": 1800 // # a switch diff --git a/keama/tests/tautology.err b/keama/tests/tautology.err index d3a12cec..e1f506dd 100644 --- a/keama/tests/tautology.err +++ b/keama/tests/tautology.err @@ -1,8 +1,5 @@ # bad (tautology) class declaration config -# authoritative is mandatory -authoritative; - # class declaration class "tautology" { # tautology diff --git a/keama/tests/tautology.msg b/keama/tests/tautology.msg index e215e327..80bf2feb 100644 --- a/keama/tests/tautology.msg +++ b/keama/tests/tautology.msg @@ -1 +1 @@ -tautology.err line 11: 'match if' with a constant boolean expression 'foo' = 'foo' +tautology.err line 8: 'match if' with a constant boolean expression 'foo' = 'foo' diff --git a/keama/tests/tautologyhexa.err b/keama/tests/tautologyhexa.err index d73ed53c..69249d86 100644 --- a/keama/tests/tautologyhexa.err +++ b/keama/tests/tautologyhexa.err @@ -1,8 +1,5 @@ # bad (tautology) class declaration config -# authoritative is mandatory -authoritative; - # class declaration class "tautology" { # tautology diff --git a/keama/tests/tautologyhexa.msg b/keama/tests/tautologyhexa.msg index ba5754e7..7482482b 100644 --- a/keama/tests/tautologyhexa.msg +++ b/keama/tests/tautologyhexa.msg @@ -1 +1 @@ -tautologyhexa.err line 11: 'match if' with a constant boolean expression 0x1234 = 0x56789a +tautologyhexa.err line 8: 'match if' with a constant boolean expression 0x1234 = 0x56789a diff --git a/keama/tests/tautologysub.err b/keama/tests/tautologysub.err index 0004af40..08de2575 100644 --- a/keama/tests/tautologysub.err +++ b/keama/tests/tautologysub.err @@ -1,8 +1,5 @@ # bad (tautology) class declaration config -# authoritative is mandatory -authoritative; - # superclass declaration class "constant" { match "foo"; diff --git a/keama/tests/tautologysub.msg b/keama/tests/tautologysub.msg index 1a2cb99c..d30f39a7 100644 --- a/keama/tests/tautologysub.msg +++ b/keama/tests/tautologysub.msg @@ -1 +1 @@ -tautologysub.err line 12: class matching rule evaluated to a constant boolean expression: 'foo' = 'bar' +tautologysub.err line 9: class matching rule evaluated to a constant boolean expression: 'foo' = 'bar' diff --git a/keama/tests/temporary6.in6 b/keama/tests/temporary6.in6 index 1be8e94e..dec7d99b 100644 --- a/keama/tests/temporary6.in6 +++ b/keama/tests/temporary6.in6 @@ -1,8 +1,5 @@ # DHCPv6 temporary (aka IA_TA) range config -# authoritative is mandatory -authoritative; - # subnet declaration subnet6 2001::/64 { # range declaration diff --git a/keama/tests/temporary6.out b/keama/tests/temporary6.out index 98d8bec2..e7af7bba 100644 --- a/keama/tests/temporary6.out +++ b/keama/tests/temporary6.out @@ -1,11 +1,10 @@ { # DHCPv6 temporary (aka IA_TA) range config - # authoritative is mandatory + # subnet declaration /// This configuration declares some subnets but has no interfaces-config /// Reference Kea #245 "Dhcp6": { "subnet6": [ - # subnet declaration { "id": 1, "subnet": "2001::/64", diff --git a/keama/tests/textarray.err b/keama/tests/textarray.err index 234eb7d5..7cecd7a0 100644 --- a/keama/tests/textarray.err +++ b/keama/tests/textarray.err @@ -1,8 +1,5 @@ # option definition config -# authoritative is mandatory -authoritative; - # options option space foobar; diff --git a/keama/tests/textarray.msg b/keama/tests/textarray.msg index 56f9ef86..f1115cbe 100644 --- a/keama/tests/textarray.msg +++ b/keama/tests/textarray.msg @@ -1 +1 @@ -textarray.err line 10: arrays of text strings not yet supported. +textarray.err line 7: arrays of text strings not yet supported. diff --git a/keama/tests/vendorspace4.in4 b/keama/tests/vendorspace4.in4 index 7f9306b0..98f9eada 100644 --- a/keama/tests/vendorspace4.in4 +++ b/keama/tests/vendorspace4.in4 @@ -1,8 +1,5 @@ # vendor option space config -# authoritative is mandatory -authoritative; - option space foo; option foo.bar code 1 = text; diff --git a/keama/tests/vendorspace4.out b/keama/tests/vendorspace4.out index 6c5e8d85..09feae6f 100644 --- a/keama/tests/vendorspace4.out +++ b/keama/tests/vendorspace4.out @@ -1,6 +1,5 @@ { # vendor option space config - # authoritative is mandatory "Dhcp4": { "option-def": [ { diff --git a/keama/tests/ws/kea.json b/keama/tests/ws/kea.json index 01b49b7f..febb1af2 100644 --- a/keama/tests/ws/kea.json +++ b/keama/tests/ws/kea.json @@ -8,6 +8,7 @@ /// This configuration declares some subnets but has no interfaces-config /// Reference Kea #245 "Dhcp4": { + "authoritative": true, "option-data": [ { "space": "dhcp4", diff --git a/keama/tests/zone4.in4 b/keama/tests/zone4.in4 index 60c1b17d..cc4fc92e 100644 --- a/keama/tests/zone4.in4 +++ b/keama/tests/zone4.in4 @@ -1,8 +1,5 @@ # zone executable statement construct -# authoritative is mandatory -authoritative; - # empty configs are not accepted by Kea default-lease-time 1800; diff --git a/keama/tests/zone4.out b/keama/tests/zone4.out index 68ba3eb3..1808ee50 100644 --- a/keama/tests/zone4.out +++ b/keama/tests/zone4.out @@ -1,6 +1,6 @@ { # zone executable statement construct - # authoritative is mandatory + # empty configs are not accepted by Kea "Dhcp4": { "valid-lifetime": 1800 // # a zone |