|
 |
34952bd |
From 282b1c9ea58cc0f2337a72912808505e5f540d5a Mon Sep 17 00:00:00 2001
|
|
|
34952bd |
From: =?UTF-8?q?Petr=20Men=C5=A1=C3=ADk?= <pemensik@redhat.com>
|
|
|
34952bd |
Date: Sat, 28 Jan 2023 11:32:05 +0100
|
|
|
34952bd |
Subject: [PATCH] Minimal change to compile with BIND 9.18.11
|
|
|
34952bd |
|
|
|
34952bd |
DSCP codes are not working and their support were removed from BIND9. Do
|
|
|
34952bd |
not require them to be present.
|
|
|
34952bd |
---
|
|
|
34952bd |
src/fwd.c | 4 ++++
|
|
|
34952bd |
1 file changed, 4 insertions(+)
|
|
|
34952bd |
|
|
|
34952bd |
diff --git a/src/fwd.c b/src/fwd.c
|
|
|
34952bd |
index 24f6e53..10ec848 100644
|
|
|
34952bd |
--- a/src/fwd.c
|
|
|
34952bd |
+++ b/src/fwd.c
|
|
|
34952bd |
@@ -198,7 +198,9 @@ fwd_print_list_buff(isc_mem_t *mctx, dns_forwarders_t *fwdrs,
|
|
|
34952bd |
INSIST((fwdr_int == NULL) == (fwdr_cfg == NULL)), fwdr_int != NULL;
|
|
|
34952bd |
fwdr_int = ISC_LIST_NEXT(fwdr_int, link), fwdr_cfg = cfg_list_next(fwdr_cfg)) {
|
|
|
34952bd |
fwdr_cfg->obj->value.sockaddrdscp.sockaddr = fwdr_int->addr;
|
|
|
34952bd |
+#if LIBDNS_VERSION_MAJOR < 1811
|
|
|
34952bd |
fwdr_cfg->obj->value.sockaddrdscp.dscp = fwdr_int->dscp;
|
|
|
34952bd |
+#endif
|
|
|
34952bd |
}
|
|
|
34952bd |
cfg_print(faddresses, buffer_append_str, &tmp_buf);
|
|
|
34952bd |
|
|
|
34952bd |
@@ -281,7 +283,9 @@ fwd_parse_str(const char *fwdrs_str, isc_mem_t *mctx,
|
|
|
34952bd |
isc_sockaddr_setport(&addr, port);
|
|
|
34952bd |
fwdr = isc_mem_get(mctx, sizeof(*(fwdr)));
|
|
|
34952bd |
fwdr->addr = addr;
|
|
|
34952bd |
+#if LIBDNS_VERSION_MAJOR < 1811
|
|
|
34952bd |
fwdr->dscp = cfg_obj_getdscp(fwdr_cfg);
|
|
|
34952bd |
+#endif
|
|
|
34952bd |
ISC_LINK_INIT(fwdr, link);
|
|
|
34952bd |
ISC_LIST_APPEND(*fwdrs, fwdr, link);
|
|
|
34952bd |
}
|
|
|
34952bd |
--
|
|
|
34952bd |
2.39.1
|
|
|
34952bd |
|