gentoo auto-resync : 19:10:2022 - 13:58:24

6 files changed, 144 insertions, 27 deletions

diff --git a/mail-mta/exim/Manifest b/mail-mta/exim/Manifest
index 08764bbb873e..11fe0cc93240 100644
--- a/mail-mta/exim/Manifest
+++ b/mail-mta/exim/Manifest
@@ -5,11 +5,13 @@ AUX exim-4.74-radius-db-ENV-clash.patch 667 BLAKE2B 3cc03dd925333774c08484efbb5d
 AUX exim-4.76-crosscompile.patch 462 BLAKE2B de78322f93760cef0d5a768b8be6c723f00d5c7557da6189ffa6ee34215c41ebe8896a2457b2e6a704d05a1730eab09c8cc73e3ba3140954f9ac32423210b612 SHA512 d4fd4417c1ce727f139999c399795312cdbbb9735d0793d68f8e3150240bc53b31277cb26f9946ba549b34c661fc0a61147d376bda09aa6763cab55d80d62343
 AUX exim-4.80-spool-mail-group.patch 946 BLAKE2B a3b6783b77823c5a8373623d16b85e2ba209b419b6724f307c46bf961bc5195690453208cdd40e45bc36e5a070892414c7737a97fa04e653e78050c153c59079 SHA512 24f30e9a9d90dc0f1fe8b3db26f8bc2649182b4e78110dc28a9c0f3a3feb7589f923144a4f1c54a1c46ff8cfe40826a1f2212787753be752f4d15a72d54a143b
 AUX exim-4.93-as-needed-ldflags.patch 6013 BLAKE2B 2de473f089a36cabd5481020524dcb2efb7a5681b224608a8454aebc70e07f7776fe812f02fa5d81fb80b25bc2cc154924953d173d65664b1e576176a01191b9 SHA512 df6c18a7d092d9069dd6d4177154681197de86ab41dbd399055ad663cbd0c7da149f8bbcb7c888965851475ee2cf891dc934f1d5ad7a4ea3dc46a54ece582418
+AUX exim-4.94-CVE-2022-3559.patch 3251 BLAKE2B e23e7ddeb36a2fec3dd3a3cfc2b858af45464c6b538650e8f7d376e85e6561dcb5d048c280d6f27f28367d16862a32fe0fd9d31a966b5e50ad9f51bd12fc487b SHA512 ebde747a12dfddb3c6250dff4a79b1ffb307468ae5fa8630bfb7720c1354e2fdc4d2c908bcb314769825724720acdfde55b8a182839883abfaa714a2ebdd0762
 AUX exim-4.94-localscan_dlopen.patch 9595 BLAKE2B c48eaaf486585890dc4028beaca7a39d5b1d965323468c4c317d099ccf0e2e983e9366cb923e0b34546a66ac718ee15e8f682a65cdcd771de8164f76b86c0aa2 SHA512 bd7872473ad1ab9eca41757ca6ee7dd8628bddfa145191aea6a5ac4b62b0e4e3539803cf75fcb22b8bfdcca33a7d2f71ff58ca1862f456960e6b7e4d262ba6ef
 AUX exim-4.94-maildir.patch 316 BLAKE2B fe0b27712e77eba83244434c33372cec47fa317026d159de7a0ac37f2563999a6470df2dc203c1fcda8e7074c949133a0311c2b94c4b48bbc46d64c7c486202c SHA512 13863226883f79dcc781fe8eb3b50ad3c5511af130cf6e41ce40e8543d46832668bd7d746a2cc67842748cdf26144bef4aece49397d3168819215eac93ca1e6e
 AUX exim-4.94-opendmarc-1.4.patch 506 BLAKE2B d8ba66e1165dffb9ba367b997d69090fa8b31aa6ce3cb17d6ade4bd3b3dabf2a2d93223106eeb7f39754397eb17979e66d52de8dc2d524de9019c9598cd89af6 SHA512 6145f07c0b5b4234160fd3480329759a06500b658643523f32bcfa9158258a9b708095725f2e56d5538567f888c5e0e954c4ac51c8f2d16921dc4950241cd2fc
 AUX exim-4.94.2-fix-crash-resolve.patch 809 BLAKE2B cd9d3d923510315f75a3bad8c56b89b59782f9af8523a794845b1163c0bac5682f311a86eda1b8e78396d77c159629ef5186416626ebe627d723e17e3b388afc SHA512 a00960409e835dd067c88b4cb34953bc9343417ddfd448f5042b1597bc127f95937a5d8786d6f3ae347654842344d61ec268c7ed37e0f05c79ef7c530f741a7b
 AUX exim-4.95-localscan_dlopen.patch 7621 BLAKE2B 6df3c1acb585dc87759e056f7bb44e50219812c3ca41364fff77942cc2d6f7452d8f4c158f17295bc586eeacc8048e24f767bab0464d300a7cb7d357c63bedd9 SHA512 1cf52ac9637a753ff7257c274bc09591a8c761fc6599cbb2cceb213272573c371dbc5db6b028c2f745989013c21af54c45facf5f2bf5c87742e299c12a9b8a1b
+AUX exim-4.96-dmarc_use_after_free.patch 1026 BLAKE2B 6d94bfd5f313afa826d247d7a88a1cbf7a3d2e5124dcd69767b131740030d2793306eca80c5de2206f7d7f683e117ffbbaccace947a2ad726b6adb2b3dcb0fc8 SHA512 c1e61b5d85563265eb14b5ba8c88cd6bc78d0ad3730051f57408fa43d16a2eeeb98d8890d0dc7b36f9aaea284c5b0a890fb8db824666ee31b462084be14a7156
 AUX exim-submission.socket 161 BLAKE2B 409a5a687897af369a6a2ff0c30564096cc6b308dbc5d0afb6742df44d2aa972e45bad9681d2cb72be9731b260d23fdadb80bae644e7b875af5e34e9c8b8b40f SHA512 4a233761793e3510e9efa5aad3a6098c41b757f13133a7ea825680f2b393aba8d7935f16bf1dd065dde884fe7ba45639a8d398333a7d9bf0a6b72f88c8f2a09d
 AUX exim-submission_at.service 360 BLAKE2B 9ebcac1ab0f01a8264141843a4e711d77f634bdd910406bd466a0c197fdad8a9ff4bc31b9b28ef73c810aaff3e549eb60c0a2546507910dfc800da154eb1da00 SHA512 dc28698f15e8eaa4614ae81fc8cb76d92fed1110ce02f7a6ee8feace418dbb194711eb2d4dd444cf818628c11721e21d80b7b974879ab6ddd78cc717cce17c2f
 AUX exim.confd 141 BLAKE2B bc200e6121544d17e7feb0e162b5f6a5157647c3323492218da1556a19f3a2febf89a698e157a6dc657540d2f46088a9b1e34700655c715fbeaf0c201bc4aa9f SHA512 cb5e4aa71d3f0b7945e9806064f6a3ab64cb894381654ead40c73a49ae2d1bbb3dc587919952a09b2c81b9fcf8784f73d59c12081cda96a5b7210442f5088998
@@ -23,7 +25,7 @@ DIST exim-4.96.tar.xz 1879152 BLAKE2B 4b424f2ebc661bd0db35d7f6da86300c6d5cb5b9a5
 DIST exim-pdf-4.94.2.tar.xz 2092248 BLAKE2B 973ab4f117fdb58afa017bc41b4496fac1277e707a9926d67317c455b0bd617021c17cba6c8d793d8962aacef12c0790d5add7174017512b7b1ea070f8e8533d SHA512 3a661f69d81a992798d4b7e5b7def7cfffa297a7b3c02a6631be426cefff5a6e8783fa322a1bd105d01f7b06968d01e77963e6ab7be3157f63eb62eb6ff172b0
 DIST exim-pdf-4.96.tar.xz 2137468 BLAKE2B 7f61767f91864c43a3b7b6ca36ec7f41da6ad7029687a38cfa9307c444c2ffbd3eb61d45645ffd20ec16ba64a37e1ff08c02e7e4e36499c7783679af9a399081 SHA512 05e94579631656330d95d237c58bc9fd52229a067c5846e7c3409b4c83040c9216819bcb0090673d9991fd59e2c2025340592b31b241b557c6775782106854d1
 DIST system_filter.exim.gz 3075 BLAKE2B d05e872b5cef377d29126cda03fc0a74c8777b2119b76ff43da6e8de808035eb9bfcb034a85d81824f135d484e864bfc0629fc1af2c228a7277d5ee7cf9cde79 SHA512 cb358d3ce2499a0bb5920d962a06f2af8486e55ec90c8c928bd8e3aefb279aa57f5f960d5adfcef68bd94110b405eaa144e9629cfe6014a529c79c544600bbf3
-EBUILD exim-4.94.2-r7.ebuild 14992 BLAKE2B 41b12e90e25606d117b47c213fa8d4c27124da935d1ddfc6df28144fdee585b60194110884ebfcf7fbcd34c5798e4b3c0386ca7f35174932ec371d31d00329fc SHA512 d70ea9bd3e4dca90d3f528f6f1a642f01f623e0de6ebdd04268ad4cc9ef20764fd046ec14707485955aaf710a4c4275c7285867579ecf275262acb578f2281e7
-EBUILD exim-4.94.2-r8.ebuild 16260 BLAKE2B 829c9ec037b421849e55acbf4bf911f90d262b89e26bd1698c44894ce03ae760ff7cd9008b5b71f58f69cf77fdc9876527014071fe54e31946f1de6ea1fc048f SHA512 a4820d3df1d51f33020984c64e8c19951aaf90430c8974de067bdc3c9287d95825f1a851a8135cdd2aaad5b2eaab94822abdee80bdcce70752f2f0e9ec518e9d
-EBUILD exim-4.96-r1.ebuild 15869 BLAKE2B 28298c02de539ba42680548aa4b7bd60129ac380ba60f4dfa59ffe2d79ce055c1576fd4ddbe4e0d3fb045892489636550c78f9b57a9748f938f056a4db633fc6 SHA512 a4bd058a81ec653b093c62662e7ee21093932ad58d795d7397f12ee9965060c85c52ba37bf3c3f6028e4ceb610127c14c5159f7d9540fa108decee462d98641e
+EBUILD exim-4.94.2-r10.ebuild 16180 BLAKE2B a619a8de75342115eb107b1d9e2430718703181a24603097cf532227b801b67a3995902239166e8510ae7f6578f726aa38bab14825cd1521b91c827e7a96cbdd SHA512 8345dbf0b128b39c7cab4ff2e20e196f746bd70176d584cff29640276c5abd6962148d7d93ced58796b144d8386810dc03de1882a6f7d3510031c6cc6ca7629b
+EBUILD exim-4.94.2-r7.ebuild 14840 BLAKE2B beec43c20d547763f805f10531a5cddf46e2339760dbb8545c9715b4031dc6325b16e1f3e79c20be364bfc681bdb652ee316b2653c5ed6ae2eea2dfad5872ba2 SHA512 6598f7597787e1eef199aebae2aba4213c8059d1246b4418ea03c786c24923342285ad4208c076cdfec37645d9781e2aa7573b18dd8e28aefb06af964ef616b0
+EBUILD exim-4.96-r2.ebuild 15788 BLAKE2B c35234d38a5cb58ec4d82bc4eaf20e536f855f783cb4c9f324ad0db3555ecd4d45f2ddfa0d6b05e7c90ac294598a516134d6b8d81d9394b0d7472def7f183871 SHA512 3513a65e2958be49bd6e3e33a3ca093307aa7e1008f70a7d460896e916fb3f2e6a97aba790df9fa562e4b8d01dfe275569bece1f5795b5a0b1d5af9d859557e0
 MISC metadata.xml 2759 BLAKE2B 4f5d0d9fbd244b0836de4bd0d3b84f45376628a12e019c89e49e6dbd7128c19f16281fdfb401d852f57f27f547184351000382cc7333a524f7be280e0799d8d8 SHA512 85a2eaef07eb68d51a1307c6d76bef6620e7311ffda593750ebee5fe84affac2e026c971818500004c0ab9722a8e84c8eb0394fb66bb2ba6cd3465cf7e1f1a73
diff --git a/mail-mta/exim/exim-4.94.2-r8.ebuild b/mail-mta/exim/exim-4.94.2-r10.ebuild
index 7cce1a0a02e3..c62c296b2534 100644
--- a/mail-mta/exim/exim-4.94.2-r8.ebuild
+++ b/mail-mta/exim/exim-4.94.2-r10.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="7"
 
-inherit db-use toolchain-funcs multilib pam systemd
+inherit db-use toolchain-funcs pam systemd
 
 IUSE="arc berkdb +dane dcc +dkim dlfunc dmarc +dnsdb doc dovecot-sasl
 dsn exiscan-acl gdbm gnutls idn ipv6 ldap lmtp maildir mbx
@@ -97,18 +97,13 @@ DEPEND="${COMMON_DEPEND}"
 RDEPEND="${COMMON_DEPEND}
 	!mail-mta/courier
 	!mail-mta/esmtp
-	!mail-mta/mini-qmail
-	!<mail-mta/msmtp-1.4.19-r1
-	!>=mail-mta/msmtp-1.4.19-r1[mta]
+	!mail-mta/msmtp[mta]
 	!mail-mta/netqmail
 	!mail-mta/nullmailer
 	!mail-mta/postfix
-	!mail-mta/qmail-ldap
 	!mail-mta/sendmail
 	!mail-mta/opensmtpd
-	!<mail-mta/ssmtp-2.64-r2
-	!>=mail-mta/ssmtp-2.64-r2[mta]
-	!net-mail/mailwrapper
+	!mail-mta/ssmtp[mta]
 	>=net-mail/mailbase-0.00-r5
 	virtual/logger
 	dcc? ( mail-filter/dcc )
@@ -126,6 +121,7 @@ src_prepare() {
 	eapply     "${FILESDIR}"/exim-4.69-r1.27021.patch
 	eapply     "${FILESDIR}"/exim-4.94-localscan_dlopen.patch
 	eapply     "${FILESDIR}"/exim-4.94.2-fix-crash-resolve.patch # 799368 upstr
+	eapply     "${FILESDIR}"/exim-4.94-CVE-2022-3559.patch  # 877607 upstr
 
 	# for this reason we have a := dep on opendmarc, they changed their
 	# API in a minor release
diff --git a/mail-mta/exim/exim-4.94.2-r7.ebuild b/mail-mta/exim/exim-4.94.2-r7.ebuild
index 4d949c4c4c01..2c3b5101c59f 100644
--- a/mail-mta/exim/exim-4.94.2-r7.ebuild
+++ b/mail-mta/exim/exim-4.94.2-r7.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="7"
 
-inherit db-use toolchain-funcs multilib pam systemd
+inherit db-use toolchain-funcs pam systemd
 
 IUSE="arc +dane dcc +dkim dlfunc dmarc +dnsdb doc dovecot-sasl dsn exiscan-acl gnutls idn ipv6 ldap lmtp maildir mbx mysql nis pam perl pkcs11 postgres +prdr proxy radius redis sasl selinux spf sqlite srs +srs-alt srs-native +ssl syslog tcpd +tpda X"
 REQUIRED_USE="
@@ -89,18 +89,13 @@ DEPEND="${COMMON_DEPEND}"
 RDEPEND="${COMMON_DEPEND}
 	!mail-mta/courier
 	!mail-mta/esmtp
-	!mail-mta/mini-qmail
-	!<mail-mta/msmtp-1.4.19-r1
-	!>=mail-mta/msmtp-1.4.19-r1[mta]
+	!mail-mta/msmtp[mta]
 	!mail-mta/netqmail
 	!mail-mta/nullmailer
 	!mail-mta/postfix
-	!mail-mta/qmail-ldap
 	!mail-mta/sendmail
 	!mail-mta/opensmtpd
-	!<mail-mta/ssmtp-2.64-r2
-	!>=mail-mta/ssmtp-2.64-r2[mta]
-	!net-mail/mailwrapper
+	!mail-mta/ssmtp[mta]
 	>=net-mail/mailbase-0.00-r5
 	virtual/logger
 	dcc? ( mail-filter/dcc )
diff --git a/mail-mta/exim/exim-4.96-r1.ebuild b/mail-mta/exim/exim-4.96-r2.ebuild
index 719ead900410..739a2fcdea96 100644
--- a/mail-mta/exim/exim-4.96-r1.ebuild
+++ b/mail-mta/exim/exim-4.96-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="7"
 
-inherit db-use toolchain-funcs multilib pam systemd
+inherit db-use toolchain-funcs pam systemd
 
 IUSE="arc berkdb +dane dcc +dkim dlfunc dmarc +dnsdb doc dovecot-sasl
 dsn exiscan-acl gdbm gnutls idn ipv6 ldap lmtp maildir mbx
@@ -93,18 +93,13 @@ DEPEND="${COMMON_DEPEND}"
 RDEPEND="${COMMON_DEPEND}
 	!mail-mta/courier
 	!mail-mta/esmtp
-	!mail-mta/mini-qmail
-	!<mail-mta/msmtp-1.4.19-r1
-	!>=mail-mta/msmtp-1.4.19-r1[mta]
+	!mail-mta/msmtp[mta]
 	!mail-mta/netqmail
 	!mail-mta/nullmailer
 	!mail-mta/postfix
-	!mail-mta/qmail-ldap
 	!mail-mta/sendmail
 	!mail-mta/opensmtpd
-	!<mail-mta/ssmtp-2.64-r2
-	!>=mail-mta/ssmtp-2.64-r2[mta]
-	!net-mail/mailwrapper
+	!mail-mta/ssmtp[mta]
 	>=net-mail/mailbase-0.00-r5
 	virtual/logger
 	dcc? ( mail-filter/dcc )
@@ -121,6 +116,7 @@ src_prepare() {
 	eapply -p0 "${FILESDIR}"/exim-4.76-crosscompile.patch # 266591
 	eapply     "${FILESDIR}"/exim-4.69-r1.27021.patch
 	eapply     "${FILESDIR}"/exim-4.95-localscan_dlopen.patch
+	eapply -p2 "${FILESDIR}"/exim-4.96-dmarc_use_after_free.patch # upstr
 
 	# oddity, they disable berkdb as hack, and then throw an error when
 	# berkdb isn't enabled
diff --git a/mail-mta/exim/files/exim-4.94-CVE-2022-3559.patch b/mail-mta/exim/files/exim-4.94-CVE-2022-3559.patch
new file mode 100644
index 000000000000..8793514b8fb7
--- /dev/null
+++ b/mail-mta/exim/files/exim-4.94-CVE-2022-3559.patch
@@ -0,0 +1,97 @@
+Patch cleaned up for Gentoo
+- applied to 4.94
+- removed unnecessary whitespace changes
+
+From 4e9ed49f8f12eb331b29bd5b6dc3693c520fddc2 Mon Sep 17 00:00:00 2001
+From: Jeremy Harris <jgh146exb@wizmail.org>
+Date: Wed, 31 Aug 2022 15:37:40 +0100
+Subject: [PATCH 1/1] Fix $regex<n> use-after-free.  Bug 2915
+
+--- exim-4.94.2/src/exim.c	2021-04-30 14:08:21.000000000 +0200
++++ exim-4.94.2/src/exim.c	2022-10-19 09:15:58.611447982 +0200
+@@ -1886,8 +1886,6 @@
+   regex_must_compile(US"^[A-Za-z0-9_/.-]*$", FALSE, TRUE);
+ #endif
+ 
+-for (i = 0; i < REGEX_VARS; i++) regex_vars[i] = NULL;
+-
+ /* If the program is called as "mailq" treat it as equivalent to "exim -bp";
+ this seems to be a generally accepted convention, since one finds symbolic
+ links called "mailq" in standard OS configurations. */
+@@ -5841,7 +5839,7 @@
+   deliver_localpart_data = deliver_domain_data =
+   recipient_data = sender_data = NULL;
+   acl_var_m = NULL;
+-  for(int i = 0; i < REGEX_VARS; i++) regex_vars[i] = NULL;
++  regex_vars_clear();
+ 
+   store_reset(reset_point);
+   }
+--- exim-4.94.2/src/functions.h	2021-04-30 14:08:21.000000000 +0200
++++ exim-4.94.2/src/functions.h	2022-10-19 09:17:44.882122667 +0200
+@@ -417,6 +417,7 @@
+ #endif
+ extern BOOL    regex_match_and_setup(const pcre *, const uschar *, int, int);
+ extern const pcre *regex_must_compile(const uschar *, BOOL, BOOL);
++extern void    regex_vars_clear(void);
+ extern void    retry_add_item(address_item *, uschar *, int);
+ extern BOOL    retry_check_address(const uschar *, host_item *, uschar *, BOOL,
+                  uschar **, uschar **);
+--- exim-4.94.2/src/globals.c	2022-10-19 09:14:19.344751853 +0200
++++ exim-4.94.2/src/globals.c	2022-10-19 09:18:27.675991666 +0200
+@@ -1289,7 +1289,7 @@
+ #endif
+ const pcre *regex_ismsgid      = NULL;
+ const pcre *regex_smtp_code    = NULL;
+-uschar *regex_vars[REGEX_VARS];
++uschar *regex_vars[REGEX_VARS] = { 0 };
+ #ifdef WHITELIST_D_MACROS
+ const pcre *regex_whitelisted_macro = NULL;
+ #endif
+--- exim-4.94.2/src/regex.c	2021-04-30 14:08:21.000000000 +0200
++++ exim-4.94.2/src/regex.c	2022-10-19 09:35:03.229084750 +0200
+@@ -98,7 +106,7 @@
+ int ret = FAIL;
+ 
+ /* reset expansion variable */
+-regex_match_string = NULL;
++regex_vars_clear();
+ 
+ if (!mime_stream)				/* We are in the DATA ACL */
+   {
+@@ -166,8 +174,7 @@
+ int mime_subject_len = 0;
+ int ret;
+ 
+-/* reset expansion variable */
+-regex_match_string = NULL;
++regex_vars_clear();
+ 
+ /* precompile our regexes */
+ if (!(re_list_head = compile(*listptr)))
+@@ -213,3 +205,12 @@
+ }
+ 
+ #endif /* WITH_CONTENT_SCAN */
++
++/* reset expansion variables */
++void
++regex_vars_clear(void)
++{
++regex_match_string = NULL;
++for (int i = 0; i < REGEX_VARS; i++) regex_vars[i] = NULL;
++}
++
+--- exim-4.94.2/src/smtp_in.c	2021-04-30 14:08:21.000000000 +0200
++++ exim-4.94.2/src/smtp_in.c	2022-10-19 09:15:58.613447975 +0200
+@@ -2161,8 +2161,10 @@
+ #ifdef SUPPORT_I18N
+ message_smtputf8 = FALSE;
+ #endif
++regex_vars_clear();
+ body_linecount = body_zerocount = 0;
+ 
++lookup_value = NULL;				/* Can be set by ACL */
+ sender_rate = sender_rate_limit = sender_rate_period = NULL;
+ ratelimiters_mail = NULL;           /* Updated by ratelimit ACL condition */
+                    /* Note that ratelimiters_conn persists across resets. */
diff --git a/mail-mta/exim/files/exim-4.96-dmarc_use_after_free.patch b/mail-mta/exim/files/exim-4.96-dmarc_use_after_free.patch
new file mode 100644
index 000000000000..dc2f62e9ba0f
--- /dev/null
+++ b/mail-mta/exim/files/exim-4.96-dmarc_use_after_free.patch
@@ -0,0 +1,31 @@
+From 12fb3842f81bcbd4a4519d5728f2d7e0e3ca1445 Mon Sep 17 00:00:00 2001
+From: Lorenz Brun <lorenz@brun.one>
+Date: Fri, 14 Oct 2022 21:02:51 +0200
+Subject: [PATCH] DMARC: fix use-after-free in dmarc_dns_lookup
+
+This fixes a use-after-free in dmarc_dns_lookup where the result
+of dns_lookup in dnsa is freed before the required data is copied out.
+
+Fixes: 9258363 ("DNS: explicit alloc/free of workspace")
+---
+ src/src/dmarc.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/src/src/dmarc.c b/src/src/dmarc.c
+index ad0c26c91..53c2752ac 100644
+--- a/src/src/dmarc.c
++++ b/src/src/dmarc.c
+@@ -230,8 +230,9 @@ if (rc == DNS_SUCCEED)
+        rr = dns_next_rr(dnsa, &dnss, RESET_NEXT))
+     if (rr->type == T_TXT && rr->size > 3)
+       {
++      uschar *record = string_copyn_taint(US rr->data, rr->size, GET_TAINTED);
+       store_free_dns_answer(dnsa);
+-      return string_copyn_taint(US rr->data, rr->size, GET_TAINTED);
++      return record;
+       }
+ store_free_dns_answer(dnsa);
+ return NULL;
+-- 
+2.30.2
+