alphabetize optionstable

(cherry picked from commit bc4006c0d341af0a0cfbc4f6fb493028d06652b7)

diff --git a/lib/bind9/check.c b/lib/bind9/check.c
index faa467cba0ba29f1c1d960d5e283f2256631faf5..91ceb6f74cc133ce4a6d8e948efbbd416d523462 100644 (file)
--- a/lib/bind9/check.c
+++ b/lib/bind9/check.c
@@ -1432,69 +1432,69 @@ check_zoneconf(const cfg_obj_t *zconfig, const cfg_obj_t *voptions,
        dns_masterformat_t masterformat;
 
        static optionstable options[] = {
-       { "allow-query", MASTERZONE | SLAVEZONE | STUBZONE | REDIRECTZONE |
-          CHECKACL | STATICSTUBZONE },
        { "allow-notify", SLAVEZONE | CHECKACL },
+       { "allow-query", MASTERZONE | SLAVEZONE | STUBZONE | REDIRECTZONE |
+         CHECKACL | STATICSTUBZONE },
        { "allow-transfer", MASTERZONE | SLAVEZONE | CHECKACL },
-       { "notify", MASTERZONE | SLAVEZONE },
+       { "allow-update", MASTERZONE | CHECKACL },
+       { "allow-update-forwarding", SLAVEZONE | CHECKACL },
        { "also-notify", MASTERZONE | SLAVEZONE },
-       { "dialup", MASTERZONE | SLAVEZONE | STUBZONE | STREDIRECTZONE },
+       { "auto-dnssec", MASTERZONE | SLAVEZONE },
+       { "check-dup-records", MASTERZONE },
+       { "check-mx", MASTERZONE },
+       { "check-mx-cname", MASTERZONE },
+       { "check-srv-cname", MASTERZONE },
+       { "check-wildcard", MASTERZONE },
+       { "database", MASTERZONE | SLAVEZONE | STUBZONE | REDIRECTZONE },
        { "delegation-only", HINTZONE | STUBZONE | FORWARDZONE |
-          DELEGATIONZONE },
-       { "forward", MASTERZONE | SLAVEZONE | STUBZONE |
-         STATICSTUBZONE | FORWARDZONE },
-       { "forwarders", MASTERZONE | SLAVEZONE | STUBZONE |
-         STATICSTUBZONE | FORWARDZONE },
+         DELEGATIONZONE },
+       { "dialup", MASTERZONE | SLAVEZONE | STUBZONE | STREDIRECTZONE },
+       { "dnssec-dnskey-kskonly", MASTERZONE | SLAVEZONE },
+       { "dnssec-loadkeys-interval", MASTERZONE | SLAVEZONE },
+       { "dnssec-secure-to-insecure", MASTERZONE },
+       { "file", MASTERZONE | SLAVEZONE | STUBZONE | HINTZONE | REDIRECTZONE },
+       { "forward", MASTERZONE | SLAVEZONE | STUBZONE | STATICSTUBZONE |
+         FORWARDZONE },
+       { "forwarders", MASTERZONE | SLAVEZONE | STUBZONE | STATICSTUBZONE |
+         FORWARDZONE },
+       { "integrity-check", MASTERZONE },
+       { "ixfr-base", MASTERZONE | SLAVEZONE },
+       { "ixfr-tmp-file", MASTERZONE | SLAVEZONE },
+       { "journal", MASTERZONE | SLAVEZONE | STREDIRECTZONE },
+       { "key-directory", MASTERZONE | SLAVEZONE },
        { "maintain-ixfr-base", MASTERZONE | SLAVEZONE | STREDIRECTZONE },
+       { "masterfile-format", MASTERZONE | SLAVEZONE | STUBZONE |
+         REDIRECTZONE },
+       { "masters", SLAVEZONE | STUBZONE | REDIRECTZONE },
        { "max-ixfr-log-size", MASTERZONE | SLAVEZONE | STREDIRECTZONE },
-       { "notify-source", MASTERZONE | SLAVEZONE },
-       { "notify-source-v6", MASTERZONE | SLAVEZONE },
-       { "transfer-source", SLAVEZONE | STUBZONE | STREDIRECTZONE },
-       { "transfer-source-v6", SLAVEZONE | STUBZONE | STREDIRECTZONE },
-       { "max-transfer-time-in", SLAVEZONE | STUBZONE | STREDIRECTZONE },
-       { "max-transfer-time-out", MASTERZONE | SLAVEZONE },
+       { "max-refresh-time", SLAVEZONE | STUBZONE | STREDIRECTZONE },
+       { "max-retry-time", SLAVEZONE | STUBZONE | STREDIRECTZONE },
        { "max-transfer-idle-in", SLAVEZONE | STUBZONE | STREDIRECTZONE },
        { "max-transfer-idle-out", MASTERZONE | SLAVEZONE },
-       { "max-retry-time", SLAVEZONE | STUBZONE | STREDIRECTZONE },
-       { "min-retry-time", SLAVEZONE | STUBZONE | STREDIRECTZONE },
-       { "max-refresh-time", SLAVEZONE | STUBZONE | STREDIRECTZONE },
-       { "min-refresh-time", SLAVEZONE | STUBZONE | STREDIRECTZONE },
+       { "max-transfer-time-in", SLAVEZONE | STUBZONE | STREDIRECTZONE },
+       { "max-transfer-time-out", MASTERZONE | SLAVEZONE },
        { "max-zone-ttl", MASTERZONE | REDIRECTZONE },
-       { "dnssec-secure-to-insecure", MASTERZONE },
+       { "min-refresh-time", SLAVEZONE | STUBZONE | STREDIRECTZONE },
+       { "min-retry-time", SLAVEZONE | STUBZONE | STREDIRECTZONE },
+       { "notify", MASTERZONE | SLAVEZONE },
+       { "notify-source", MASTERZONE | SLAVEZONE },
+       { "notify-source-v6", MASTERZONE | SLAVEZONE },
+       { "pubkey", MASTERZONE | SLAVEZONE | STUBZONE },
+       { "server-addresses", STATICSTUBZONE },
+       { "server-names", STATICSTUBZONE },
        { "sig-re-signing-interval", MASTERZONE | SLAVEZONE },
        { "sig-signing-nodes", MASTERZONE | SLAVEZONE },
        { "sig-signing-signatures", MASTERZONE | SLAVEZONE },
        { "sig-signing-type", MASTERZONE | SLAVEZONE },
        { "sig-validity-interval", MASTERZONE | SLAVEZONE },
        { "signing", MASTERZONE | SLAVEZONE },
+       { "transfer-source", SLAVEZONE | STUBZONE | STREDIRECTZONE },
+       { "transfer-source-v6", SLAVEZONE | STUBZONE | STREDIRECTZONE },
+       { "try-tcp-refresh", SLAVEZONE | STREDIRECTZONE },
+       { "update-check-ksk", MASTERZONE | SLAVEZONE },
+       { "update-policy", MASTERZONE },
        { "zone-statistics", MASTERZONE | SLAVEZONE | STUBZONE |
          STATICSTUBZONE | REDIRECTZONE },
-       { "allow-update", MASTERZONE | CHECKACL },
-       { "allow-update-forwarding", SLAVEZONE | CHECKACL },
-       { "file", MASTERZONE | SLAVEZONE | STUBZONE | HINTZONE | REDIRECTZONE },
-       { "journal", MASTERZONE | SLAVEZONE | STREDIRECTZONE },
-       { "ixfr-base", MASTERZONE | SLAVEZONE },
-       { "ixfr-tmp-file", MASTERZONE | SLAVEZONE },
-       { "masters", SLAVEZONE | STUBZONE | REDIRECTZONE },
-       { "pubkey", MASTERZONE | SLAVEZONE | STUBZONE },
-       { "update-policy", MASTERZONE },
-       { "database", MASTERZONE | SLAVEZONE | STUBZONE | REDIRECTZONE },
-       { "key-directory", MASTERZONE | SLAVEZONE },
-       { "check-wildcard", MASTERZONE },
-       { "check-mx", MASTERZONE },
-       { "check-dup-records", MASTERZONE },
-       { "integrity-check", MASTERZONE },
-       { "check-mx-cname", MASTERZONE },
-       { "check-srv-cname", MASTERZONE },
-       { "masterfile-format", MASTERZONE | SLAVEZONE | STUBZONE |
-         REDIRECTZONE },
-       { "update-check-ksk", MASTERZONE | SLAVEZONE },
-       { "dnssec-dnskey-kskonly", MASTERZONE | SLAVEZONE },
-       { "dnssec-loadkeys-interval", MASTERZONE | SLAVEZONE },
-       { "auto-dnssec", MASTERZONE | SLAVEZONE },
-       { "try-tcp-refresh", SLAVEZONE | STREDIRECTZONE },
-       { "server-addresses", STATICSTUBZONE },
-       { "server-names", STATICSTUBZONE },
        };
 
        static optionstable dialups[] = {