add --enable-dnsrps to gitlab CI

enable DNSRPS in the continuous integration tests

this triggered a build failure in OpenBSD; building with DNSRPS
causes arpa/nameser.h to be included, which defines the value
STATUS. that value was then reused in server.c  renaming the
value to STAT corrects the error.

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d13c717af94e5b3cc697e524db867f2bd230b3bf..a1f1692dfc93436afbf4682a468487dea8cad9d1 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -226,6 +226,7 @@ stages:
       --enable-developer
       --enable-option-checking=fatal
       --enable-dnstap
+      --enable-dnsrps
       --with-cmocka
       --with-libxml2
       --with-json-c

diff --git a/bin/named/server.c b/bin/named/server.c
index 2fdf3db1122f6693ca6e24c79c12f94af5aace7a..6a2ae1aa8dc0b4f1915cb5c0cac9ed28a4549801 100644 (file)
--- a/bin/named/server.c
+++ b/bin/named/server.c
@@ -15851,7 +15851,7 @@ named_server_mkeys(named_server_t *server, isc_lex_t *lex,
        dns_view_t *view = NULL;
        dns_rdataclass_t rdclass;
        char msg[DNS_NAME_FORMATSIZE + 500] = "";
-       enum { NONE, STATUS, REFRESH, SYNC, DESTROY } opt = NONE;
+       enum { NONE, STAT, REFRESH, SYNC, DESTROY } opt = NONE;
        bool found = false;
        bool first = true;
 
@@ -15870,7 +15870,7 @@ named_server_mkeys(named_server_t *server, isc_lex_t *lex,
        }
 
        if (strcasecmp(cmd, "status") == 0) {
-               opt = STATUS;
+               opt = STAT;
        } else if (strcasecmp(cmd, "refresh") == 0) {
                opt = REFRESH;
        } else if (strcasecmp(cmd, "sync") == 0) {
@@ -15929,7 +15929,7 @@ named_server_mkeys(named_server_t *server, isc_lex_t *lex,
                        }
                        CHECK(mkey_refresh(view, text));
                        break;
-               case STATUS:
+               case STAT:
                        if (!first) {
                                CHECK(putstr(text, "\n\n"));
                        }