From 23f070db6843a1d94f3cb6cffc1befcf9f187d50 Mon Sep 17 00:00:00 2001
From: Laurent Bercot <ska-skaware@skarnet.org>
Date: Mon, 9 Feb 2026 11:46:02 +0000
Subject:  yay, bugfix. Also add DESTDIR to runtime dir creation.

---
 package/targets.mak    | 20 ++++++++++----------
 src/qmail-remote/dns.c |  7 ++-----
 2 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/package/targets.mak b/package/targets.mak
index a88c134..f957f22 100644
--- a/package/targets.mak
+++ b/package/targets.mak
@@ -11,13 +11,13 @@ QMAILR_UID := $(firstword $(subst :, ,$(QMAILR_IDS)))
 QMAILR_GID := $(lastword $(subst :, ,$(QMAILR_IDS)))
 
 install-qmailr:
-	mkdir -p -- $(QMAIL_HOME)/run/qmail-remote
-	chgrp -- $(QMAILR_GID) $(QMAIL_HOME)/run
-	chmod 02750 $(QMAIL_HOME)/run
-	chown -- $(QMAILR_IDS) $(QMAIL_HOME)/run/qmail-remote
-	chmod 02700 $(QMAIL_HOME)/run/qmail-remote
-	chown -- $(QMAILR_IDS) $(QMAIL_HOME)/run/qmail-remote
-	chmod 02750 $(QMAIL_HOME)/run/qmail-remote
-	touch -- $(QMAIL_HOME)/run/qmail-remote/tcpto6
-	chown -- $(QMAILR_IDS) $(QMAIL_HOME)/run/qmail-remote/tcpto6
-	chmod 0640 $(QMAIL_HOME)/run/qmail-remote/tcpto6
+	mkdir -p -- $(DESTDIR)$(QMAIL_HOME)/run/qmail-remote
+	chgrp -- $(QMAILR_GID) $(DESTDIR)$(QMAIL_HOME)/run
+	chmod 02750 $(DESTDIR)$(QMAIL_HOME)/run
+	chown -- $(QMAILR_IDS) $(DESTDIR)$(QMAIL_HOME)/run/qmail-remote
+	chmod 02700 $(DESTDIR)$(QMAIL_HOME)/run/qmail-remote
+	chown -- $(QMAILR_IDS) $(DESTDIR)$(QMAIL_HOME)/run/qmail-remote
+	chmod 02750 $(DESTDIR)$(QMAIL_HOME)/run/qmail-remote
+	touch -- $(DESTDIR)$(QMAIL_HOME)/run/qmail-remote/tcpto6
+	chown -- $(QMAILR_IDS) $(DESTDIR)$(QMAIL_HOME)/run/qmail-remote/tcpto6
+	chmod 0640 $(DESTDIR)$(QMAIL_HOME)/run/qmail-remote/tcpto6
diff --git a/src/qmail-remote/dns.c b/src/qmail-remote/dns.c
index 472065d..0c44783 100644
--- a/src/qmail-remote/dns.c
+++ b/src/qmail-remote/dns.c
@@ -186,14 +186,11 @@ unsigned int dns_stuff (char const *host, char const *const *eaddr, unsigned int
           {
 #ifdef DEBUG
             char exch[256] ;
-            {
-              s6dns_domain_t dexch = mxs[i].exchange ;
-              s6dns_domain_decode(&dexch) ;
-              s6dns_domain_tostring(exch, 256, &dexch) ;
-            }
+            s6dns_domain_tostring(exch, 256, &mxs[i].exchange) ;
 #endif
             mxipinfo *p = genalloc_s(mxipinfo, &mxipi) + i ;
             p->ip4 = p->ip6 = stralloc_zero ;
+            s6dns_domain_encode(&mxs[i].exchange) ;
             if (!skadns_send_g(&a, &p->id4, &mxs[i].exchange, S6DNS_T_A, &deadline, &deadline))
               qmailr_tempusys("send ", "A", " DNS query") ;
             LOLDEBUG("sending A for %s, id %hu", exch, p->id4) ;
-- 
cgit v1.3.1