alphabetize options_clauses

diff --git a/lib/isccfg/namedconf.c b/lib/isccfg/namedconf.c
index a4a346d2ce8fec77b368cf2d42ab7bfbb0ede011..8d2b7a47b7222b49b44a67a3743cbc420697d6d0 100644 (file)
--- a/lib/isccfg/namedconf.c
+++ b/lib/isccfg/namedconf.c
@@ -1028,14 +1028,30 @@ options_clauses[] = {
        { "avoid-v6-udp-ports", &cfg_type_bracketed_portlist, 0 },
        { "bindkeys-file", &cfg_type_qstring, 0 },
        { "blackhole", &cfg_type_bracketed_aml, 0 },
-       { "cookie-secret", &cfg_type_sstring, 0 },
        { "cookie-algorithm", &cfg_type_cookiealg, 0 },
+       { "cookie-secret", &cfg_type_sstring, 0 },
        { "coresize", &cfg_type_size, 0 },
        { "datasize", &cfg_type_size, 0 },
+       { "deallocate-on-exit", &cfg_type_boolean, CFG_CLAUSEFLAG_OBSOLETE },
+       { "directory", &cfg_type_qstring, CFG_CLAUSEFLAG_CALLBACK },
 #ifdef HAVE_DNSTAP
        { "dnstap-output", &cfg_type_dnstapoutput, 0 },
        { "dnstap-identity", &cfg_type_serverid, 0 },
        { "dnstap-version", &cfg_type_qstringornone, 0 },
+#else
+       { "dnstap-output", &cfg_type_dnstapoutput,
+         CFG_CLAUSEFLAG_NOTCONFIGURED },
+       { "dnstap-identity", &cfg_type_serverid,
+         CFG_CLAUSEFLAG_NOTCONFIGURED },
+       { "dnstap-version", &cfg_type_qstringornone,
+         CFG_CLAUSEFLAG_NOTCONFIGURED },
+#endif
+       { "dscp", &cfg_type_uint32, 0 },
+       { "dump-file", &cfg_type_qstring, 0 },
+       { "fake-iquery", &cfg_type_boolean, CFG_CLAUSEFLAG_OBSOLETE },
+       { "files", &cfg_type_size, 0 },
+       { "flush-zones-on-shutdown", &cfg_type_boolean, 0 },
+#ifdef HAVE_DNSTAP
        { "fstrm-set-buffer-hint", &cfg_type_uint32, 0 },
        { "fstrm-set-flush-timeout", &cfg_type_uint32, 0 },
        { "fstrm-set-input-queue-size", &cfg_type_uint32, 0 },
@@ -1044,12 +1060,6 @@ options_clauses[] = {
        { "fstrm-set-output-queue-size", &cfg_type_uint32, 0 },
        { "fstrm-set-reopen-interval", &cfg_type_uint32, 0 },
 #else
-       { "dnstap-output", &cfg_type_dnstapoutput,
-         CFG_CLAUSEFLAG_NOTCONFIGURED },
-       { "dnstap-identity", &cfg_type_serverid,
-         CFG_CLAUSEFLAG_NOTCONFIGURED },
-       { "dnstap-version", &cfg_type_qstringornone,
-         CFG_CLAUSEFLAG_NOTCONFIGURED },
        { "fstrm-set-buffer-hint", &cfg_type_uint32,
          CFG_CLAUSEFLAG_NOTCONFIGURED },
        { "fstrm-set-flush-timeout", &cfg_type_uint32,
@@ -1065,16 +1075,6 @@ options_clauses[] = {
        { "fstrm-set-reopen-interval", &cfg_type_uint32,
          CFG_CLAUSEFLAG_NOTCONFIGURED },
 #endif /* HAVE_DNSTAP */
-       { "session-keyfile", &cfg_type_qstringornone, 0 },
-       { "session-keyname", &cfg_type_astring, 0 },
-       { "session-keyalg", &cfg_type_astring, 0 },
-       { "deallocate-on-exit", &cfg_type_boolean, CFG_CLAUSEFLAG_OBSOLETE },
-       { "directory", &cfg_type_qstring, CFG_CLAUSEFLAG_CALLBACK },
-       { "dscp", &cfg_type_uint32, 0 },
-       { "dump-file", &cfg_type_qstring, 0 },
-       { "fake-iquery", &cfg_type_boolean, CFG_CLAUSEFLAG_OBSOLETE },
-       { "files", &cfg_type_size, 0 },
-       { "flush-zones-on-shutdown", &cfg_type_boolean, 0 },
 #ifdef HAVE_GEOIP
        { "geoip-directory", &cfg_type_qstringornone, 0 },
        { "geoip-use-ecs", &cfg_type_boolean, 0 },
@@ -1096,22 +1096,25 @@ options_clauses[] = {
        { "managed-keys-directory", &cfg_type_qstring, 0 },
        { "match-mapped-addresses", &cfg_type_boolean, 0 },
        { "max-rsa-exponent-size", &cfg_type_uint32, 0 },
-       { "memstatistics-file", &cfg_type_qstring, 0 },
        { "memstatistics", &cfg_type_boolean, 0 },
+       { "memstatistics-file", &cfg_type_qstring, 0 },
        { "multiple-cnames", &cfg_type_boolean, CFG_CLAUSEFLAG_OBSOLETE },
        { "named-xfer", &cfg_type_qstring, CFG_CLAUSEFLAG_OBSOLETE },
        { "notify-rate", &cfg_type_uint32, 0 },
        { "pid-file", &cfg_type_qstringornone, 0 },
        { "port", &cfg_type_uint32, 0 },
        { "querylog", &cfg_type_boolean, 0 },
-       { "recursing-file", &cfg_type_qstring, 0 },
        { "random-device", &cfg_type_qstring, 0 },
+       { "recursing-file", &cfg_type_qstring, 0 },
        { "recursive-clients", &cfg_type_uint32, 0 },
        { "reserved-sockets", &cfg_type_uint32, 0 },
        { "secroots-file", &cfg_type_qstring, 0 },
        { "serial-queries", &cfg_type_uint32, CFG_CLAUSEFLAG_OBSOLETE },
        { "serial-query-rate", &cfg_type_uint32, 0 },
        { "server-id", &cfg_type_serverid, 0 },
+       { "session-keyalg", &cfg_type_astring, 0 },
+       { "session-keyfile", &cfg_type_qstringornone, 0 },
+       { "session-keyname", &cfg_type_astring, 0 },
        { "sit-secret", &cfg_type_sstring, CFG_CLAUSEFLAG_OBSOLETE },
        { "stacksize", &cfg_type_size, 0 },
        { "startup-notify-rate", &cfg_type_uint32, 0 },
@@ -1124,13 +1127,13 @@ options_clauses[] = {
        { "tcp-keepalive-timeout", &cfg_type_uint32, 0 },
        { "tcp-listen-queue", &cfg_type_uint32, 0 },
        { "tkey-dhkey", &cfg_type_tkey_dhkey, 0 },
+       { "tkey-domain", &cfg_type_qstring, 0 },
        { "tkey-gssapi-credential", &cfg_type_qstring, 0 },
        { "tkey-gssapi-keytab", &cfg_type_qstring, 0 },
-       { "tkey-domain", &cfg_type_qstring, 0 },
        { "transfer-message-size", &cfg_type_uint32, 0 },
-       { "transfers-per-ns", &cfg_type_uint32, 0 },
        { "transfers-in", &cfg_type_uint32, 0 },
        { "transfers-out", &cfg_type_uint32, 0 },
+       { "transfers-per-ns", &cfg_type_uint32, 0 },
        { "treat-cr-as-space", &cfg_type_boolean, CFG_CLAUSEFLAG_OBSOLETE },
        { "use-id-pool", &cfg_type_boolean, CFG_CLAUSEFLAG_OBSOLETE },
        { "use-ixfr", &cfg_type_boolean, CFG_CLAUSEFLAG_OBSOLETE },