mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-08-30 05:57:52 +00:00
Code Issues Releases Wiki Activity

add --enable-dnsrps to gitlab CI

Browse Source 
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.
This commit is contained in:
Evan Hunt 2023-03-15 14:05:26 -07:00
parent f43de96460
commit b573d4abf8
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitlab-ci.yml
View File

@ -226,6 +226,7 @@ stages:
--enable-developer --enable-developer
--enable-option-checking=fatal --enable-option-checking=fatal
--enable-dnstap --enable-dnstap
--enable-dnsrps
--with-cmocka --with-cmocka
--with-libxml2 --with-libxml2
--with-json-c --with-json-c

6
bin/named/server.c
View File

@ -15851,7 +15851,7 @@ named_server_mkeys(named_server_t *server, isc_lex_t *lex,
dns_view_t *view = NULL; dns_view_t *view = NULL;
dns_rdataclass_t rdclass; dns_rdataclass_t rdclass;
char msg[DNS_NAME_FORMATSIZE + 500] = ""; 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 found = false;
bool first = true; bool first = true;
@ -15870,7 +15870,7 @@ named_server_mkeys(named_server_t *server, isc_lex_t *lex,
} }
if (strcasecmp(cmd, "status") == 0) { if (strcasecmp(cmd, "status") == 0) {
opt = STATUS; opt = STAT;
} else if (strcasecmp(cmd, "refresh") == 0) { } else if (strcasecmp(cmd, "refresh") == 0) {
opt = REFRESH; opt = REFRESH;
} else if (strcasecmp(cmd, "sync") == 0) { } 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)); CHECK(mkey_refresh(view, text));
break; break;
case STATUS: case STAT:
if (!first) { if (!first) {
CHECK(putstr(text, "\n\n")); CHECK(putstr(text, "\n\n"));
} }