From 70b7b4e6076c7451837b88836450c308a0fab060 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= <jskarvad@redhat.com>
Date: Mon, 16 Dec 2019 10:00:10 +0100
Subject: [PATCH] Fixed DNS resolver to use ref_search instead of ref_query  
 Resolves: rhbz#1723950

---
 postfix-3.4.8-ref-search-fix.patch | 13 +++++++++++++
 postfix.spec                       |  9 ++++++++-
 2 files changed, 21 insertions(+), 1 deletion(-)
 create mode 100644 postfix-3.4.8-ref-search-fix.patch

diff --git a/postfix-3.4.8-ref-search-fix.patch b/postfix-3.4.8-ref-search-fix.patch
new file mode 100644
index 0000000..c7d831e
--- /dev/null
+++ b/postfix-3.4.8-ref-search-fix.patch
@@ -0,0 +1,13 @@
+diff --git a/src/dns/dns_lookup.c b/src/dns/dns_lookup.c
+index 1ea98b3..1bfeb7e 100644
+--- a/src/dns/dns_lookup.c
++++ b/src/dns/dns_lookup.c
+@@ -396,7 +396,7 @@ static int dns_res_search(const char *name, int class, int type,
+     if (keep_notfound)
+ 	/* Prepare for returning a null-padded server reply. */
+ 	memset(answer, 0, anslen);
+-    len = res_query(name, class, type, answer, anslen);
++    len = res_search(name, class, type, answer, anslen);
+     /* Begin API creep workaround. */
+     if (len < 0 && h_errno == 0) {
+ 	SET_H_ERRNO(TRY_AGAIN);
diff --git a/postfix.spec b/postfix.spec
index ad0fda4..5adfcd9 100644
--- a/postfix.spec
+++ b/postfix.spec
@@ -48,7 +48,7 @@
 Name: postfix
 Summary: Postfix Mail Transport Agent
 Version: 3.4.8
-Release: 1%{?dist}
+Release: 2%{?dist}
 Epoch: 2
 URL: http://www.postfix.org
 License: (IBM and GPLv2+) or (EPL-2.0 and GPLv2+)
@@ -94,6 +94,8 @@ Patch9: pflogsumm-1.1.5-datecalc.patch
 Patch10: pflogsumm-1.1.5-ipv6-warnings-fix.patch
 Patch11: postfix-3.4.4-chroot-example-fix.patch
 Patch12: postfix-3.4.4-res-macros-fix.patch
+# rhbz#1723950, included upstream
+Patch13: postfix-3.4.8-ref-search-fix.patch
 
 # Optional patches - set the appropriate environment variables to include
 #                    them when building the package/spec file
@@ -230,6 +232,7 @@ popd
 %endif
 %patch11 -p1 -b .chroot-example-fix
 %patch12 -p1 -b .res-macros-fix
+%patch13 -p1 -b .ref-search-fix
 
 for f in README_FILES/TLS_{LEGACY_,}README TLS_ACKNOWLEDGEMENTS; do
 	iconv -f iso8859-1 -t utf8 -o ${f}{_,} &&
@@ -757,6 +760,10 @@ fi
 %endif
 
 %changelog
+* Mon Dec 16 2019 Jaroslav Škarvada <jskarvad@redhat.com> - 2:3.4.8-2
+- Fixed DNS resolver to use ref_search instead of ref_query
+  Resolves: rhbz#1723950
+
 * Mon Nov 25 2019 Jaroslav Škarvada <jskarvad@redhat.com> - 2:3.4.8-1
 - New version
   Resolves: rhbz#1776033