From: Mark Andrews <marka@isc.org>
Date: Fri, 21 Feb 2014 01:48:39 +0000 (+1100)
Subject: add CFG_CLAUSEFLAG_NOTCONFIGURED flag
X-Git-Tag: v9.10.0b1~28
X-Git-Url: http://git.ipfire.org/gitweb/index.cgi?a=commitdiff_plain;h=5e45c8aabfad8f0c7995c4b8cf27690c1395ef8d;p=thirdparty%2Fbind9.git

add CFG_CLAUSEFLAG_NOTCONFIGURED flag
---

diff --git a/doc/misc/options b/doc/misc/options
index ff889bdf6a0..498e5a93b61 100644
--- a/doc/misc/options
+++ b/doc/misc/options
@@ -147,6 +147,7 @@ options {
         forward ( first | only );
         forwarders [ port <integer> ] [ dscp <integer> ] { ( <ipv4_address>
             | <ipv6_address> ) [ port <integer> ] [ dscp <integer> ]; ... };
+        geoip-directory ( <quoted_string> | none ); // not configured
         has-old-clients <boolean>; // obsolete
         heartbeat-interval <integer>;
         host-statistics <boolean>; // not implemented
@@ -191,6 +192,7 @@ options {
         multiple-cnames <boolean>; // obsolete
         named-xfer <quoted_string>; // obsolete
         no-case-compress { <address_match_element>; ... };
+        nosit-udp-size <integer>; // not configured
         notify <notifytype>;
         notify-delay <integer>;
         notify-source ( <ipv4_address> | * ) [ port ( <integer> | * ) ] [
@@ -233,6 +235,7 @@ options {
         request-ixfr <boolean>;
         request-ixfr <boolean>;
         request-nsid <boolean>;
+        request-sit <boolean>; // not configured
         reserved-sockets <integer>;
         resolver-query-timeout <integer>;
         response-policy { zone <quoted_string> [ policy ( given | disabled
@@ -257,6 +260,7 @@ options {
         sig-signing-signatures <integer>;
         sig-signing-type <integer>;
         sig-validity-interval <integer> [ <integer> ];
+        sit-secret <quoted_string>; // not configured
         sortlist { <address_match_element>; ... };
         stacksize <size>;
         statistics-file <quoted_string>;
@@ -307,6 +311,7 @@ server <netprefix> {
         query-source-v6 <querysource6>;
         request-ixfr <boolean>;
         request-nsid <boolean>;
+        request-sit <boolean>; // not configured
         support-ixfr <boolean>; // obsolete
         transfer-format ( many-answers | one-answer );
         transfer-source ( <ipv4_address> | * ) [ port ( <integer> | * ) ] [
@@ -445,6 +450,7 @@ view <string> <optional_class> {
         minimal-responses <boolean>;
         multi-master <boolean>;
         no-case-compress { <address_match_element>; ... };
+        nosit-udp-size <integer>; // not configured
         notify <notifytype>;
         notify-delay <integer>;
         notify-source ( <ipv4_address> | * ) [ port ( <integer> | * ) ] [
@@ -481,6 +487,7 @@ view <string> <optional_class> {
         request-ixfr <boolean>;
         request-ixfr <boolean>;
         request-nsid <boolean>;
+        request-sit <boolean>; // not configured
         resolver-query-timeout <integer>;
         response-policy { zone <quoted_string> [ policy ( given | disabled
             | passthru | no-op | drop | tcp-only | nxdomain | nodata |
@@ -509,6 +516,7 @@ view <string> <optional_class> {
                 query-source-v6 <querysource6>;
                 request-ixfr <boolean>;
                 request-nsid <boolean>;
+                request-sit <boolean>; // not configured
                 support-ixfr <boolean>; // obsolete
                 transfer-format ( many-answers | one-answer );
                 transfer-source ( <ipv4_address> | * ) [ port ( <integer> |
diff --git a/lib/isccfg/namedconf.c b/lib/isccfg/namedconf.c
index fec718ac3b7..fa42da6f5ab 100644
--- a/lib/isccfg/namedconf.c
+++ b/lib/isccfg/namedconf.c
@@ -975,6 +975,9 @@ options_clauses[] = {
 	{ "flush-zones-on-shutdown", &cfg_type_boolean, 0 },
 #ifdef HAVE_GEOIP
 	{ "geoip-directory", &cfg_type_qstringornone, 0 },
+#else
+	{ "geoip-directory", &cfg_type_qstringornone,
+	  CFG_CLAUSEFLAG_NOTCONFIGURED },
 #endif /* HAVE_GEOIP */
 	{ "has-old-clients", &cfg_type_boolean, CFG_CLAUSEFLAG_OBSOLETE },
 	{ "heartbeat-interval", &cfg_type_uint32, 0 },
@@ -986,6 +989,8 @@ options_clauses[] = {
 	{ "listen-on-v6", &cfg_type_listenon, CFG_CLAUSEFLAG_MULTI },
 #ifdef ISC_PLATFORM_USESIT
 	{ "sit-secret", &cfg_type_qstring, 0 },
+#else
+	{ "sit-secret", &cfg_type_qstring, CFG_CLAUSEFLAG_NOTCONFIGURED },
 #endif
 	{ "managed-keys-directory", &cfg_type_qstring, 0 },
 	{ "match-mapped-addresses", &cfg_type_boolean, 0 },
@@ -1522,6 +1527,8 @@ view_clauses[] = {
 	{ "lame-ttl", &cfg_type_uint32, 0 },
 #ifdef ISC_PLATFORM_USESIT
 	{ "nosit-udp-size", &cfg_type_uint32, 0 },
+#else
+	{ "nosit-udp-size", &cfg_type_uint32, CFG_CLAUSEFLAG_NOTCONFIGURED },
 #endif
 	{ "max-acache-size", &cfg_type_sizenodefault, 0 },
 	{ "max-cache-size", &cfg_type_sizenodefault, 0 },
@@ -1548,6 +1555,8 @@ view_clauses[] = {
 	{ "request-ixfr", &cfg_type_boolean, 0 },
 #ifdef ISC_PLATFORM_USESIT
 	{ "request-sit", &cfg_type_boolean, 0 },
+#else
+	{ "request-sit", &cfg_type_boolean, CFG_CLAUSEFLAG_NOTCONFIGURED },
 #endif
 	{ "request-nsid", &cfg_type_boolean, 0 },
 	{ "resolver-query-timeout", &cfg_type_uint32, 0 },
@@ -1828,6 +1837,8 @@ server_clauses[] = {
 	{ "support-ixfr", &cfg_type_boolean, CFG_CLAUSEFLAG_OBSOLETE },
 #ifdef ISC_PLATFORM_USESIT
 	{ "request-sit", &cfg_type_boolean, 0 },
+#else
+	{ "request-sit", &cfg_type_boolean, CFG_CLAUSEFLAG_NOTCONFIGURED },
 #endif
 	{ "request-nsid", &cfg_type_boolean, 0 },
 	{ "transfers", &cfg_type_uint32, 0 },
@@ -2212,8 +2223,8 @@ static cfg_type_t cfg_type_geoipdb = {
 };
 
 static cfg_tuplefielddef_t geoip_fields[] = {
-	{ "negated", &cfg_type_void, 0},
-	{ "db", &cfg_type_geoipdb, 0},
+	{ "negated", &cfg_type_void, 0 },
+	{ "db", &cfg_type_geoipdb, 0 },
 	{ "subtype", &cfg_type_geoiptype, 0 },
 	{ "search", &cfg_type_astring, 0 },
 	{ NULL, NULL, 0 }