diff options
| author | Vladimír Čunát <vladimir.cunat@nic.cz> | 2023-07-11 10:17:57 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vladimir.cunat@nic.cz> | 2023-07-11 10:17:57 +0200 |
| commit | 08bd2d9d5521af8da911dea1332bcc4857e1487f (patch) | |
| tree | 5382dd61a41b61f00dc5c6b5a969b30b9a9e6466 /modules | |
| parent | Merge !1418: avoid 5.x style config and systemd units, by default (diff) | |
| parent | Merge !1422: avoid knot_pkt_default_padding_size() (diff) | |
| download | knot-resolver-08bd2d9d5521af8da911dea1332bcc4857e1487f.tar.xz knot-resolver-08bd2d9d5521af8da911dea1332bcc4857e1487f.zip | |
Merge branch 'master' into 6.0
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/hints/hints.c | 4 | ||||
| -rw-r--r-- | modules/http/debug_opensslkeylog.c | 1 |
2 files changed, 5 insertions, 0 deletions
diff --git a/modules/hints/hints.c b/modules/hints/hints.c index ccbc9880..e2624225 100644 --- a/modules/hints/hints.c +++ b/modules/hints/hints.c @@ -44,6 +44,10 @@ static char * bool2jsonstr(bool val) return result; } + knot_dname_in_bailiwick(qry->sname, (const uint8_t *)"\4arpa\0") > 0 && + (knot_dname_in_bailiwick(qry->sname, (const uint8_t *)"\7in-addr\4arpa\0") > 0 + || knot_dname_in_bailiwick(qry->sname, (const uint8_t *)"\3ip6\4arpa\0") > 0); + if (is_rev) { static int parse_addr_str(union kr_sockaddr *sa, const char *addr) { int family = strchr(addr, ':') ? AF_INET6 : AF_INET; diff --git a/modules/http/debug_opensslkeylog.c b/modules/http/debug_opensslkeylog.c index 6709eb73..20699bf9 100644 --- a/modules/http/debug_opensslkeylog.c +++ b/modules/http/debug_opensslkeylog.c @@ -69,6 +69,7 @@ static int keylog_file_fd = -1; #pragma GCC diagnostic ignored "-Wpedantic" #pragma GCC diagnostic ignored "-Wunused-result" +#pragma GCC diagnostic ignored "-Wstrict-prototypes" static inline void put_hex(char *buffer, int pos, char c) { |