update to 4.3.09

1 files changed, 36 insertions, 35 deletions

diff --git a/src/Makefile b/src/Makefile
index d560613..2dc256e 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -80,8 +80,8 @@ compile auto_qmail.c
 	./compile auto_qmail.c
 
 auto_queue.c: \
-auto-str ../conf-home
-	./auto-str auto_queue `head -1 ../conf-home` > auto_queue.c
+auto-str ../conf-queue
+	./auto-str auto_queue `head -1 ../conf-queue` > auto_queue.c
 
 auto_queue.o: \
 compile auto_queue.c
@@ -509,8 +509,8 @@ tryidn2.c compile load
 	rm -f tryind2.o tryidn2
 
 install: \
-load install.o hier.o auto_qmail.o auto_split.o auto_uids.o fifo.o qlibs.lib
-	./load install hier.o auto_qmail.o auto_split.o auto_uids.o fifo.o \
+load install.o hier.o auto_qmail.o auto_queue.o auto_split.o auto_uids.o fifo.o qlibs.lib
+	./load install hier.o auto_qmail.o auto_queue.o auto_split.o auto_uids.o fifo.o \
 	`cat qlibs.lib`
 
 install.o: \
@@ -518,8 +518,8 @@ compile install.c
 	./compile install.c
 
 instcheck: \
-load instcheck.o hier.o auto_qmail.o auto_split.o auto_uids.o qlibs.lib
-	./load instcheck hier.o auto_qmail.o auto_split.o auto_uids.o \
+load instcheck.o hier.o auto_qmail.o auto_queue.o auto_split.o auto_uids.o qlibs.lib
+	./load instcheck hier.o auto_qmail.o auto_split.o auto_uids.o auto_queue.o \
 	`cat qlibs.lib`
 
 instcheck.o: \
@@ -785,8 +785,9 @@ compile qmail-authuser.c hasspnam.h hasuserpw.h
 	./compile qmail-authuser.c 
 
 qmail-clean: \
-load qmail-clean.o fmtqfn.o now.o auto_qmail.o auto_split.o qlibs.lib
-	./load qmail-clean fmtqfn.o now.o auto_qmail.o auto_split.o `cat qlibs.lib`
+load qmail-clean.o fmtqfn.o now.o auto_qmail.o auto_queue.o auto_split.o qlibs.lib
+	./load qmail-clean fmtqfn.o now.o auto_qmail.o auto_queue.o auto_split.o \
+	`cat qlibs.lib`
 
 qmail-clean.o: \
 compile qmail-clean.c 
@@ -804,9 +805,9 @@ compile qmail-dkim.cpp dkim.cpp dkimbase.cpp dkimsign.cpp dkimverify.cpp
 
 qmail-dksign: \
 load qmail-dksign.o control.o constmap.o fmtqfn.o rcpthosts.o qmail-dkim \
-auto_qmail.o auto_split.o qlibs.lib
+auto_qmail.o auto_queue.o auto_split.o qlibs.lib
 	./load qmail-dksign control.o constmap.o fmtqfn.o rcpthosts.o \
-	auto_qmail.o auto_split.o `cat qlibs.lib`
+	auto_qmail.o auto_queue.o auto_split.o `cat qlibs.lib`
 
 qmail-dksign.o: \
 compile qmail-dksign.c 
@@ -814,9 +815,9 @@ compile qmail-dksign.c
 
 qmail-dkverify: \
 load qmail-dkverify.o control.o fmtqfn.o qmail-dkim \
-auto_qmail.o auto_split.o qmail.o qlibs.lib
+auto_qmail.o auto_queue.o auto_split.o qmail.o qlibs.lib
 	./load qmail-dkverify qmail.o control.o fmtqfn.o \
-	auto_qmail.o auto_split.o `cat qlibs.lib`
+	auto_qmail.o auto_queue.o auto_split.o `cat qlibs.lib`
 
 qmail-dkverify.o: \
 compile qmail-dkverify.c 
@@ -868,9 +869,9 @@ compile qmail-local.c
 
 qmail-lspawn: \
 load qmail-lspawn.o spawn.o \
-auto_qmail.o auto_uids.o auto_spawn.o qlibs.lib
+auto_qmail.o auto_queue.o auto_uids.o auto_spawn.o qlibs.lib
 	./load qmail-lspawn spawn.o \
-	auto_qmail.o auto_uids.o auto_spawn.o `cat qlibs.lib`
+	auto_qmail.o auto_queue.o auto_uids.o auto_spawn.o `cat qlibs.lib`
 
 qmail-lspawn.o: \
 compile qmail-lspawn.c 
@@ -927,12 +928,12 @@ compile qmail-vmailuser.c
 
 qmail-smtpam: \
 load qmail-smtpam.o control.o now.o dns.o constmap.o \
-ipalloc.o ipme.o quote.o auto_qmail.o tcpto.o \
+ipalloc.o ipme.o quote.o auto_qmail.o auto_queue.o tcpto.o \
 tls_timeoutio.o tls_errors.o tls_remote.o dns_tlsa.o \
 ssl.lib dns.lib socket.lib qlibs.lib ucspissl.a
 	./load qmail-smtpam constmap.o control.o dns_tlsa.o \
 	tcpto.o now.o dns.o ipalloc.o ipme.o quote.o auto_qmail.o \
-	tls_errors.o tls_remote.o tls_timeoutio.o ucspissl.a \
+	auto_queue.o tls_errors.o tls_remote.o tls_timeoutio.o ucspissl.a \
 	`cat ssl.lib` `cat dns.lib` `cat socket.lib` `cat qlibs.lib` 
 
 qmail-smtpam.o: \
@@ -1036,9 +1037,9 @@ compile qmail-qmtpd.c
 
 qmail-qread: \
 load qmail-qread.o fmtqfn.o readsubdir.o date822fmt.o datetime.a \
-auto_qmail.o auto_split.o qlibs.lib
+auto_queue.o auto_split.o qlibs.lib
 	./load qmail-qread fmtqfn.o readsubdir.o date822fmt.o \
-	datetime.a auto_qmail.o auto_split.o `cat qlibs.lib`
+	datetime.a auto_queue.o auto_split.o `cat qlibs.lib`
 
 qmail-qread.o: \
 compile qmail-qread.c 
@@ -1055,8 +1056,8 @@ warn-auto.sh qmail-qstat.sh ../conf-home ../conf-break ../conf-split
 
 qmail-queue: \
 load qmail-queue.o triggerpull.o fmtqfn.o now.o date822fmt.o \
-datetime.a auto_qmail.o auto_split.o auto_uids.o qlibs.lib
-	./load qmail-queue auto_qmail.o auto_split.o auto_uids.o \
+datetime.a auto_qmail.o auto_queue.o auto_split.o auto_uids.o qlibs.lib
+	./load qmail-queue auto_qmail.o auto_queue.o auto_split.o auto_uids.o \
 	triggerpull.o fmtqfn.o now.o date822fmt.o datetime.a `cat qlibs.lib`
 
 qmail-queue.o: \
@@ -1064,9 +1065,9 @@ compile qmail-queue.c
 	./compile qmail-queue.c
 
 qmail-qmaint: \
-load qmail-qmaint.o auto_qmail.o auto_split.o auto_uids.o fifo.o \
+load qmail-qmaint.o auto_qmail.o auto_queue.o auto_split.o auto_uids.o fifo.o \
 fmtqfn.o readsubdir.o date822fmt.o datetime.a  qlibs.lib
-	./load qmail-qmaint auto_qmail.o auto_split.o auto_uids.o fifo.o \
+	./load qmail-qmaint auto_qmail.o auto_queue.o auto_split.o auto_uids.o fifo.o \
 	fmtqfn.o readsubdir.o date822fmt.o datetime.a `cat qlibs.lib`
 
 qmail-qmaint.o: \
@@ -1076,11 +1077,11 @@ compile qmail-qmaint.c
 qmail-remote: \
 load qmail-remote.o control.o tcpto.o now.o dns.o ipalloc.o ipme.o \
 quote.o tls_timeoutio.o tls_errors.o tls_remote.o dns_tlsa.o \
-base64.o constmap.o md5c.o hmac_md5.o auto_qmail.o \
+base64.o constmap.o md5c.o hmac_md5.o auto_qmail.o auto_queue.o \
 ssl.lib dns.lib socket.lib qlibs.lib idn2.lib ucspissl.a
 	./load qmail-remote control.o tcpto.o now.o \
 	base64.o constmap.o md5c.o hmac_md5.o ipalloc.o ipme.o \
-	quote.o dns.o ucspissl.a auto_qmail.o dns_tlsa.o \
+	quote.o dns.o ucspissl.a auto_qmail.o auto_queue.o dns_tlsa.o \
 	tls_errors.o tls_remote.o tls_timeoutio.o ucspissl.a \
 	`cat ssl.lib` `cat dns.lib` `cat socket.lib` `cat qlibs.lib` `cat idn2.lib`
 
@@ -1090,9 +1091,9 @@ compile qmail-remote.c
 
 qmail-rspawn: \
 load qmail-rspawn.o spawn.o tcpto_clean.o now.o \
-auto_qmail.o auto_uids.o auto_spawn.o qlibs.lib
+auto_qmail.o auto_queue.o auto_uids.o auto_spawn.o qlibs.lib
 	./load qmail-rspawn spawn.o tcpto_clean.o now.o \
-	auto_qmail.o auto_uids.o auto_spawn.o `cat qlibs.lib`
+	auto_qmail.o auto_queue.o auto_uids.o auto_spawn.o `cat qlibs.lib`
 
 qmail-rspawn.o: \
 compile qmail-rspawn.c
@@ -1101,10 +1102,10 @@ compile qmail-rspawn.c
 qmail-send: \
 load qmail-send.o qsutil.o control.o constmap.o newfield.o prioq.o \
 trigger.o fmtqfn.o quote.o now.o readsubdir.o qmail.o date822fmt.o \
-datetime.a auto_qmail.o auto_split.o qlibs.lib
+datetime.a auto_qmail.o auto_queue.o auto_split.o qlibs.lib
 	./load qmail-send qsutil.o control.o constmap.o newfield.o \
-	prioq.o trigger.o fmtqfn.o quote.o now.o readsubdir.o \
-	qmail.o date822fmt.o datetime.a auto_qmail.o auto_split.o `cat qlibs.lib`
+	prioq.o trigger.o fmtqfn.o quote.o now.o readsubdir.o qmail.o \
+	date822fmt.o datetime.a auto_qmail.o auto_queue.o auto_split.o `cat qlibs.lib`
 
 qmail-send.o: \
 compile qmail-send.c 
@@ -1146,16 +1147,16 @@ compile qmail-start.c
 	./compile qmail-start.c
 
 qmail-tcpok: \
-load qmail-tcpok.o auto_qmail.o qlibs.lib
-	./load qmail-tcpok auto_qmail.o `cat qlibs.lib`
+load qmail-tcpok.o auto_queue.o qlibs.lib
+	./load qmail-tcpok auto_queue.o `cat qlibs.lib`
 
 qmail-tcpok.o: \
 compile qmail-tcpok.c 
 	./compile qmail-tcpok.c
 
 qmail-tcpto: \
-load qmail-tcpto.o now.o auto_qmail.o qlibs.lib
-	./load qmail-tcpto now.o auto_qmail.o `cat qlibs.lib`
+load qmail-tcpto.o now.o auto_queue.o qlibs.lib
+	./load qmail-tcpto now.o auto_queue.o `cat qlibs.lib`
 
 qmail-tcpto.o: \
 compile qmail-tcpto.c 
@@ -1163,9 +1164,9 @@ compile qmail-tcpto.c
 
 qmail-todo: \
 load qmail-todo.o control.o constmap.o trigger.o fmtqfn.o \
-now.o qsutil.o readsubdir.o auto_qmail.o auto_split.o qlibs.lib
+now.o qsutil.o readsubdir.o auto_qmail.o auto_queue.o auto_split.o qlibs.lib
 	./load qmail-todo control.o constmap.o trigger.o fmtqfn.o now.o \
-	readsubdir.o qsutil.o auto_qmail.o auto_split.o `cat qlibs.lib`
+	readsubdir.o qsutil.o auto_qmail.o auto_queue.o auto_split.o `cat qlibs.lib`
 
 qmail-todo.o: \
 compile qmail-todo.c