From: Wietse Venema Date: Thu, 9 Nov 2000 05:00:00 +0000 (-0500) Subject: snapshot-20001109 X-Git-Tag: v20010228~24 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5d6408c2f3d562d4ef60feb2220ca69d51720bb8;p=thirdparty%2Fpostfix.git snapshot-20001109 --- diff --git a/postfix/HISTORY b/postfix/HISTORY index 127aecf49..209aa5cb3 100644 --- a/postfix/HISTORY +++ b/postfix/HISTORY @@ -4419,8 +4419,29 @@ Apologies for any names omitted. programs in order to test the LMTP client UNIX-domain support. -20001039 +20001030 Bugfix: further testing in preparation for 19991231-pl10 revealed that the DB map code was now broken for every platform. + +20001031 + + Performance: the slow start (gradually increase number of + parallel connections to the same site) was too gentle and + Postfix would back off too quickly. Files: qmgr/qmgr_queue.c + and nqmgr/qmgr_queue.c. + +20001101 + + FAQ update by Ralph Hildebrandt. + +20001104 + + Portability: RedHat Linux has changed incompatibly, again. + Fixed with the help of Matthias Andree. File: makedefs. + +20001109 + + Cleanup: changed prototype of internal function that did + not return a useful result. File: src/util/vstream_popen.c. diff --git a/postfix/Makefile.in b/postfix/Makefile.in index af71aa2b8..2603ce0d0 100644 --- a/postfix/Makefile.in +++ b/postfix/Makefile.in @@ -13,9 +13,9 @@ default: update makefiles Makefiles: set -e; for i in $(DIRS); do \ (set -e; echo "[$$i]"; cd $$i; rm -f Makefile; \ - $(MAKE) -f Makefile.in Makefile MAKELEVEL=); \ + $(MAKE) -f Makefile.in Makefile MAKELEVEL=) || exit 1; \ done; - rm -f Makefile; (set -e; $(SHELL) makedefs; cat Makefile.in) >Makefile + rm -f Makefile; (set -e; $(SHELL) makedefs && cat Makefile.in) >Makefile update printfck: set -e; for i in $(DIRS); do \ @@ -44,7 +44,7 @@ cleanmakefiles: ../cleanup_makefile.pl Makefile.in >Makefile.new; \ rm Makefile.in ; mv Makefile.new Makefile.in); \ done; - rm -f Makefile; (set -e; sh makedefs; cat Makefile.in) >Makefile + rm -f Makefile; (set -e; sh makedefs && cat Makefile.in) >Makefile tidy: clean rm -f Makefile */Makefile src/*/Makefile diff --git a/postfix/RELEASE_NOTES b/postfix/RELEASE_NOTES index 7842ce4d2..8ff741942 100644 --- a/postfix/RELEASE_NOTES +++ b/postfix/RELEASE_NOTES @@ -1,3 +1,9 @@ +Incompatible changes with snapshot-20001104 +=========================================== + +On RedHat Linux 7.0, you must install the db3-devel RPM before you +can compile the Postfix source code. + Incompatible changes with snapshot-20001029 =========================================== diff --git a/postfix/conf/main.cf b/postfix/conf/main.cf index 24274dd5c..15e12b10c 100644 --- a/postfix/conf/main.cf +++ b/postfix/conf/main.cf @@ -362,7 +362,7 @@ mail_owner = postfix # eligible for this "fast ETRN/sendmail -qR" service. # #fast_flush_domains = $relay_domains -#fast_flush_policy = +#fast_flush_domains = # SHOW SOFTWARE VERSION OR NOT # diff --git a/postfix/conf/sample-flush.cf b/postfix/conf/sample-flush.cf index 9b3c92791..273fde3c9 100644 --- a/postfix/conf/sample-flush.cf +++ b/postfix/conf/sample-flush.cf @@ -25,10 +25,10 @@ # destinations that the Postfix SMTP server is willing to relay to # (see the relay_domains parameter in sample-smtpd.cf). # -# Specify "fast_flush_policy =" to disable the feature altogether. +# Specify "fast_flush_domains =" to disable the feature altogether. # -fast_flush_policy = $relay_domains -#fast_flush_policy = +fast_flush_domains = $relay_domains +#fast_flush_domains = # The fast_flush_purge_time parameter controls how long an empty # per-destination "fast flush" logfile is allowed to live. diff --git a/postfix/html/faq.html b/postfix/html/faq.html index 0d54625ab..2433606ad 100644 --- a/postfix/html/faq.html +++ b/postfix/html/faq.html @@ -1169,7 +1169,7 @@ policy have their mail rejected by the SMTP server. Like this: 
-550 <user@remote>: Access denied
+554 <user@remote>: Access denied
@@ -1193,19 +1193,19 @@ LDAP or SQL. 
     /etc/postfix/main.cf:
         smtpd_recipient_restrictions =
-            hash:/etc/postfix/restricted_senders
+            check_sender_access hash:/etc/postfix/restricted_senders
             ...other stuff...
 
         smtpd_restriction_classes = local_only
-        local_only = check_sender_access hash:/etc/postfix/local_domains, reject
+        local_only = check_recipient_access hash:/etc/postfix/local_domains, reject
 
     /etc/postfix/restricted_senders:
         foo@domain      local_only
         bar@domain      local_only
 
     /etc/postfix/local_domains:
-        this.domain     OK      (matches this.domain and subdomains)
-        that.domain     OK      (matches that.domain and subdomains)
+        this.domain     OK      matches this.domain and subdomains
+        that.domain     OK      matches that.domain and subdomains

diff --git a/postfix/makedefs b/postfix/makedefs index e8e5625c6..d0cea5588 100644 --- a/postfix/makedefs +++ b/postfix/makedefs @@ -160,11 +160,23 @@ case "$SYSTEM.$RELEASE" in esac;; Linux.2*) SYSTYPE=LINUX2 # Postfix no longer needs DB 1.85 compatibility - if [ ! -f /usr/include/db.h -a -f /usr/include/db/db.h ] + if [ -f /usr/include/db.h ] + then + : we are all set + elif [ -f /usr/include/db/db.h ] then CCARGS="$CCARGS -I/usr/include/db" + else + # No, we're not going to try db1 db2 db3 etc. + # On a properly installed system, Postfix builds + # by including and by linking with -ldb + echo "No include file found." 1>&2 + echo "Install the appropriate db*-devel package first." 1>&2 + echo "See the RELEASE_NOTES file for more information." 1>&2 + exit 1 fi - for name in db nsl resolv + SYSLIBS="-ldb" + for name in nsl resolv do test -f /usr/lib/lib$name.a && SYSLIBS="$SYSLIBS -l$name" done diff --git a/postfix/src/base64/Makefile.in b/postfix/src/base64/Makefile.in index 459c0a4d5..08a2e4915 100644 --- a/postfix/src/base64/Makefile.in +++ b/postfix/src/base64/Makefile.in @@ -18,7 +18,7 @@ LIBS = ../../lib/libglobal.a ../../lib/libutil.a all: $(PROG) Makefile: Makefile.in - (set -e; echo "# DO NOT EDIT"; $(OPTS) $(SHELL) ../../makedefs; cat $?) >$@ + (set -e; echo "# DO NOT EDIT"; $(OPTS) $(SHELL) ../../makedefs && cat $?) >$@ base64decode: base64decode.o $(LIBS) $(CC) $(CFLAGS) -o $@ base64decode.o $(LIBS) $(SYSLIBS) diff --git a/postfix/src/bounce/Makefile.in b/postfix/src/bounce/Makefile.in index c0b91e553..6557cf0e5 100644 --- a/postfix/src/bounce/Makefile.in +++ b/postfix/src/bounce/Makefile.in @@ -21,7 +21,7 @@ $(PROG): $(OBJS) $(LIBS) $(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBS) $(SYSLIBS) Makefile: Makefile.in - (set -e; echo "# DO NOT EDIT"; $(OPTS) $(SHELL) ../../makedefs; cat $?) >$@ + (set -e; echo "# DO NOT EDIT"; $(OPTS) $(SHELL) ../../makedefs && cat $?) >$@ test: $(TESTPROG) diff --git a/postfix/src/cleanup/Makefile.in b/postfix/src/cleanup/Makefile.in index 23923ac6d..dd13667a6 100644 --- a/postfix/src/cleanup/Makefile.in +++ b/postfix/src/cleanup/Makefile.in @@ -25,7 +25,7 @@ $(PROG): $(OBJS) $(LIBS) $(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBS) $(SYSLIBS) Makefile: Makefile.in - (set -e; echo "# DO NOT EDIT"; $(OPTS) $(SHELL) ../../makedefs; cat $?) >$@ + (set -e; echo "# DO NOT EDIT"; $(OPTS) $(SHELL) ../../makedefs && cat $?) >$@ test: $(TESTPROG) diff --git a/postfix/src/dns/Makefile.in b/postfix/src/dns/Makefile.in index 3e544500e..e132be3db 100644 --- a/postfix/src/dns/Makefile.in +++ b/postfix/src/dns/Makefile.in @@ -20,7 +20,7 @@ INC_DIR = ../../include all: $(LIB) Makefile: Makefile.in - (set -e; echo "# DO NOT EDIT"; $(OPTS) $(SHELL) ../../makedefs; cat $?) >$@ + (set -e; echo "# DO NOT EDIT"; $(OPTS) $(SHELL) ../../makedefs && cat $?) >$@ test: $(TESTPROG) diff --git a/postfix/src/error/Makefile.in b/postfix/src/error/Makefile.in index 82a3493b1..2398dea06 100644 --- a/postfix/src/error/Makefile.in +++ b/postfix/src/error/Makefile.in @@ -19,7 +19,7 @@ $(PROG): $(OBJS) $(LIBS) $(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBS) $(SYSLIBS) Makefile: Makefile.in - (set -e; echo "# DO NOT EDIT"; $(OPTS) $(SHELL) ../../makedefs; cat $?) >$@ + (set -e; echo "# DO NOT EDIT"; $(OPTS) $(SHELL) ../../makedefs && cat $?) >$@ test: $(TESTPROG) diff --git a/postfix/src/flush/Makefile.in b/postfix/src/flush/Makefile.in index 2f0da3e52..6bdf7d2be 100644 --- a/postfix/src/flush/Makefile.in +++ b/postfix/src/flush/Makefile.in @@ -19,7 +19,7 @@ $(PROG): $(OBJS) $(LIBS) $(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBS) $(SYSLIBS) Makefile: Makefile.in - (set -e; echo "# DO NOT EDIT"; $(OPTS) $(SHELL) ../../makedefs; cat $?) >$@ + (set -e; echo "# DO NOT EDIT"; $(OPTS) $(SHELL) ../../makedefs && cat $?) >$@ test: $(TESTPROG) diff --git a/postfix/src/flush/flush.c b/postfix/src/flush/flush.c index 724341f46..e4d9adc2d 100644 --- a/postfix/src/flush/flush.c +++ b/postfix/src/flush/flush.c @@ -44,7 +44,7 @@ /* request \fBFLUSH_REQ_REFRESH\fR. /* .IP "\fBFLUSH_REQ_REFRESH\fR (completes in the background)" /* Refresh non-empty per-destination logfiles that were not read in -/* $\fBfast_flush_refresh_time\fR hours, by simulating +/* \fB$fast_flush_refresh_time\fR hours, by simulating /* send requests (see above) for the corresponding destinations. /* .sp /* Delete empty per-destination logfiles that were not updated in @@ -53,7 +53,7 @@ /* Refresh all non-empty per-destination logfiles, by simulating /* send requests (see above) for the corresponding destinations. /* This can be incredibly expensive when logging is enabled for -/* all deferred mail, and is not recommended. +/* many destinations, and is not recommended. /* .sp /* Delete empty per-destination logfiles that were not updated in /* \fBfast_flush_purge_time\fR days. @@ -83,8 +83,8 @@ /* \fBmaster.cf\fR configuration file. /* /* Upon receipt of a request to deliver all mail for an eligible -/* destination, this server requests delivery of all messages that -/* are listed in that destination's logfile, regardless of the +/* destination, the \fBflush\fR server requests delivery of all messages +/* that are listed in that destination's logfile, regardless of the /* recipients of those messages. This is not an issue for mail /* that is sent to a \fBrelay_domains\fR destination because /* such mail typically only has recipients in one domain. diff --git a/postfix/src/fsstone/Makefile.in b/postfix/src/fsstone/Makefile.in index 95713f1e9..e5f76b76f 100644 --- a/postfix/src/fsstone/Makefile.in +++ b/postfix/src/fsstone/Makefile.in @@ -18,7 +18,7 @@ LIBS = ../../lib/libglobal.a ../../lib/libutil.a all: $(PROG) Makefile: Makefile.in - (set -e; echo "# DO NOT EDIT"; $(OPTS) $(SHELL) ../../makedefs; cat $?) >$@ + (set -e; echo "# DO NOT EDIT"; $(OPTS) $(SHELL) ../../makedefs && cat $?) >$@ fsstone: fsstone.o $(LIBS) $(CC) $(CFLAGS) -o $@ fsstone.o $(LIBS) $(SYSLIBS) diff --git a/postfix/src/global/Makefile.in b/postfix/src/global/Makefile.in index 9c61b72a7..6c1b6910f 100644 --- a/postfix/src/global/Makefile.in +++ b/postfix/src/global/Makefile.in @@ -78,7 +78,7 @@ MAKES = all: $(LIB) Makefile: Makefile.in - (set -e; echo "# DO NOT EDIT"; $(OPTS) $(SHELL) ../../makedefs; cat $?) >$@ + (set -e; echo "# DO NOT EDIT"; $(OPTS) $(SHELL) ../../makedefs && cat $?) >$@ test: $(TESTPROG) diff --git a/postfix/src/global/mail_version.h b/postfix/src/global/mail_version.h index 6b9b33f29..cc43c9b7f 100644 --- a/postfix/src/global/mail_version.h +++ b/postfix/src/global/mail_version.h @@ -15,7 +15,7 @@ * Version of this program. */ #define VAR_MAIL_VERSION "mail_version" -#define DEF_MAIL_VERSION "Snapshot-20001030" +#define DEF_MAIL_VERSION "Snapshot-20001109" extern char *var_mail_version; /* LICENSE diff --git a/postfix/src/lmtp/Makefile.in b/postfix/src/lmtp/Makefile.in index 95cb8cb8c..7c8f4db72 100644 --- a/postfix/src/lmtp/Makefile.in +++ b/postfix/src/lmtp/Makefile.in @@ -21,7 +21,7 @@ $(PROG): $(OBJS) $(LIBS) $(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBS) $(SYSLIBS) Makefile: Makefile.in - (set -e; echo "# DO NOT EDIT"; $(OPTS) $(SHELL) ../../makedefs; cat $?) >$@ + (set -e; echo "# DO NOT EDIT"; $(OPTS) $(SHELL) ../../makedefs && cat $?) >$@ test: $(TESTPROG) diff --git a/postfix/src/local/Makefile.in b/postfix/src/local/Makefile.in index ba87abf37..76e5fd2a8 100644 --- a/postfix/src/local/Makefile.in +++ b/postfix/src/local/Makefile.in @@ -25,7 +25,7 @@ $(PROG): $(OBJS) $(LIBS) $(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBS) $(SYSLIBS) Makefile: Makefile.in - (set -e; echo "# DO NOT EDIT"; $(OPTS) $(SHELL) ../../makedefs; cat $?) >$@ + (set -e; echo "# DO NOT EDIT"; $(OPTS) $(SHELL) ../../makedefs && cat $?) >$@ test: $(TESTPROG) diff --git a/postfix/src/master/Makefile.in b/postfix/src/master/Makefile.in index 3a4bffece..c7b1b45a9 100644 --- a/postfix/src/master/Makefile.in +++ b/postfix/src/master/Makefile.in @@ -27,7 +27,7 @@ BIN_DIR = ../../libexec all: $(PROG) $(LIB) Makefile: Makefile.in - (set -e; echo "# DO NOT EDIT"; $(OPTS) $(SHELL) ../../makedefs; cat $?) >$@ + (set -e; echo "# DO NOT EDIT"; $(OPTS) $(SHELL) ../../makedefs && cat $?) >$@ $(PROG): $(OBJS) $(LIBS) $(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBS) $(SYSLIBS) diff --git a/postfix/src/nqmgr/Makefile.in b/postfix/src/nqmgr/Makefile.in index 376304e05..608f7faa8 100644 --- a/postfix/src/nqmgr/Makefile.in +++ b/postfix/src/nqmgr/Makefile.in @@ -25,7 +25,7 @@ $(PROG): $(OBJS) $(LIBS) $(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBS) $(SYSLIBS) Makefile: Makefile.in - (set -e; echo "# DO NOT EDIT"; $(OPTS) $(SHELL) ../../makedefs; cat $?) >$@ + (set -e; echo "# DO NOT EDIT"; $(OPTS) $(SHELL) ../../makedefs && cat $?) >$@ test: $(TESTPROG) diff --git a/postfix/src/nqmgr/qmgr_queue.c b/postfix/src/nqmgr/qmgr_queue.c index 29ee05a4f..028850ed2 100644 --- a/postfix/src/nqmgr/qmgr_queue.c +++ b/postfix/src/nqmgr/qmgr_queue.c @@ -141,13 +141,12 @@ void qmgr_queue_unthrottle(QMGR_QUEUE *queue) /* * Increase the destination's concurrency limit until we reach the - * transport's concurrency limit. Set the destination's concurrency limit - * to the actual concurrency + 1, so that qmgr_queue_throttle() takes - * effect quickly. + * transport's concurrency limit. */ if (transport->dest_concurrency_limit == 0 - || transport->dest_concurrency_limit > queue->busy_refcount) - queue->window = queue->busy_refcount + 1; + || transport->dest_concurrency_limit > queue->window) + if (queue->window <= queue->busy_refcount) + queue->window++; } /* qmgr_queue_throttle - handle destination delivery failure */ diff --git a/postfix/src/pickup/Makefile.in b/postfix/src/pickup/Makefile.in index 0e2120b21..19f5688fc 100644 --- a/postfix/src/pickup/Makefile.in +++ b/postfix/src/pickup/Makefile.in @@ -19,7 +19,7 @@ $(PROG): $(OBJS) $(LIBS) $(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBS) $(SYSLIBS) Makefile: Makefile.in - (set -e; echo "# DO NOT EDIT"; $(OPTS) $(SHELL) ../../makedefs; cat $?) >$@ + (set -e; echo "# DO NOT EDIT"; $(OPTS) $(SHELL) ../../makedefs && cat $?) >$@ test: $(TESTPROG) diff --git a/postfix/src/pipe/Makefile.in b/postfix/src/pipe/Makefile.in index 597b994e4..8575f30fb 100644 --- a/postfix/src/pipe/Makefile.in +++ b/postfix/src/pipe/Makefile.in @@ -19,7 +19,7 @@ $(PROG): $(OBJS) $(LIBS) $(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBS) $(SYSLIBS) Makefile: Makefile.in - (set -e; echo "# DO NOT EDIT"; $(OPTS) $(SHELL) ../../makedefs; cat $?) >$@ + (set -e; echo "# DO NOT EDIT"; $(OPTS) $(SHELL) ../../makedefs && cat $?) >$@ test: $(TESTPROG) diff --git a/postfix/src/postalias/Makefile.in b/postfix/src/postalias/Makefile.in index ad616647c..1fbc2a67d 100644 --- a/postfix/src/postalias/Makefile.in +++ b/postfix/src/postalias/Makefile.in @@ -19,7 +19,7 @@ $(PROG): $(OBJS) $(LIBS) $(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBS) $(SYSLIBS) Makefile: Makefile.in - (set -e; echo "# DO NOT EDIT"; $(OPTS) $(SHELL) ../../makedefs; cat $?) >$@ + (set -e; echo "# DO NOT EDIT"; $(OPTS) $(SHELL) ../../makedefs && cat $?) >$@ test: $(TESTPROG) diff --git a/postfix/src/postcat/Makefile.in b/postfix/src/postcat/Makefile.in index 5cdac2d99..c753f9aea 100644 --- a/postfix/src/postcat/Makefile.in +++ b/postfix/src/postcat/Makefile.in @@ -19,7 +19,7 @@ $(PROG): $(OBJS) $(LIBS) $(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBS) $(SYSLIBS) Makefile: Makefile.in - (set -e; echo "# DO NOT EDIT"; $(OPTS) $(SHELL) ../../makedefs; cat $?) >$@ + (set -e; echo "# DO NOT EDIT"; $(OPTS) $(SHELL) ../../makedefs && cat $?) >$@ test: $(TESTPROG) diff --git a/postfix/src/postconf/Makefile.in b/postfix/src/postconf/Makefile.in index deebdbacf..d6720d5cd 100644 --- a/postfix/src/postconf/Makefile.in +++ b/postfix/src/postconf/Makefile.in @@ -26,7 +26,7 @@ $(PROG): $(OBJS) $(LIBS) ./$(PROG) -d |egrep -v '^(myhostname|mydomain|mynetworks) ' >$@ Makefile: Makefile.in - (set -e; echo "# DO NOT EDIT"; $(OPTS) $(SHELL) ../../makedefs; cat $?) >$@ + (set -e; echo "# DO NOT EDIT"; $(OPTS) $(SHELL) ../../makedefs && cat $?) >$@ test: $(TESTPROG) diff --git a/postfix/src/postdrop/Makefile.in b/postfix/src/postdrop/Makefile.in index 4cb115291..8a1a5983c 100644 --- a/postfix/src/postdrop/Makefile.in +++ b/postfix/src/postdrop/Makefile.in @@ -19,7 +19,7 @@ $(PROG): $(OBJS) $(LIBS) $(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBS) $(SYSLIBS) Makefile: Makefile.in - (set -e; echo "# DO NOT EDIT"; $(OPTS) $(SHELL) ../../makedefs; cat $?) >$@ + (set -e; echo "# DO NOT EDIT"; $(OPTS) $(SHELL) ../../makedefs && cat $?) >$@ test: $(TESTPROG) diff --git a/postfix/src/postfix/Makefile.in b/postfix/src/postfix/Makefile.in index d2e90caa2..3b651dbec 100644 --- a/postfix/src/postfix/Makefile.in +++ b/postfix/src/postfix/Makefile.in @@ -20,7 +20,7 @@ $(PROG): $(OBJS) $(LIBS) $(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBS) $(SYSLIBS) Makefile: Makefile.in - (set -e; echo "# DO NOT EDIT"; $(OPTS) $(SHELL) ../../makedefs; cat $?) >$@ + (set -e; echo "# DO NOT EDIT"; $(OPTS) $(SHELL) ../../makedefs && cat $?) >$@ test: $(TESTPROG) diff --git a/postfix/src/postkick/Makefile.in b/postfix/src/postkick/Makefile.in index 3f037226c..b34c96736 100644 --- a/postfix/src/postkick/Makefile.in +++ b/postfix/src/postkick/Makefile.in @@ -19,7 +19,7 @@ $(PROG): $(OBJS) $(LIBS) $(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBS) $(SYSLIBS) Makefile: Makefile.in - (set -e; echo "# DO NOT EDIT"; $(OPTS) $(SHELL) ../../makedefs; cat $?) >$@ + (set -e; echo "# DO NOT EDIT"; $(OPTS) $(SHELL) ../../makedefs && cat $?) >$@ test: $(TESTPROG) diff --git a/postfix/src/postlock/Makefile.in b/postfix/src/postlock/Makefile.in index 0ef73a595..3ce69b3e6 100644 --- a/postfix/src/postlock/Makefile.in +++ b/postfix/src/postlock/Makefile.in @@ -19,7 +19,7 @@ $(PROG): $(OBJS) $(LIBS) $(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBS) $(SYSLIBS) Makefile: Makefile.in - (set -e; echo "# DO NOT EDIT"; $(OPTS) $(SHELL) ../../makedefs; cat $?) >$@ + (set -e; echo "# DO NOT EDIT"; $(OPTS) $(SHELL) ../../makedefs && cat $?) >$@ test: $(TESTPROG) diff --git a/postfix/src/postlog/Makefile.in b/postfix/src/postlog/Makefile.in index a5988ea04..c1c5948dd 100644 --- a/postfix/src/postlog/Makefile.in +++ b/postfix/src/postlog/Makefile.in @@ -20,7 +20,7 @@ $(PROG): $(OBJS) $(LIBS) $(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBS) $(SYSLIBS) Makefile: Makefile.in - (set -e; echo "# DO NOT EDIT"; $(OPTS) $(SHELL) ../../makedefs; cat $?) >$@ + (set -e; echo "# DO NOT EDIT"; $(OPTS) $(SHELL) ../../makedefs && cat $?) >$@ test: $(TESTPROG) diff --git a/postfix/src/postmap/Makefile.in b/postfix/src/postmap/Makefile.in index fe6ba1bba..b2d64c2bf 100644 --- a/postfix/src/postmap/Makefile.in +++ b/postfix/src/postmap/Makefile.in @@ -19,7 +19,7 @@ $(PROG): $(OBJS) $(LIBS) $(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBS) $(SYSLIBS) Makefile: Makefile.in - (set -e; echo "# DO NOT EDIT"; $(OPTS) $(SHELL) ../../makedefs; cat $?) >$@ + (set -e; echo "# DO NOT EDIT"; $(OPTS) $(SHELL) ../../makedefs && cat $?) >$@ test: $(TESTPROG) diff --git a/postfix/src/postsuper/Makefile.in b/postfix/src/postsuper/Makefile.in index c2f4dca68..3ff67a4d3 100644 --- a/postfix/src/postsuper/Makefile.in +++ b/postfix/src/postsuper/Makefile.in @@ -19,7 +19,7 @@ $(PROG): $(OBJS) $(LIBS) $(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBS) $(SYSLIBS) Makefile: Makefile.in - (set -e; echo "# DO NOT EDIT"; $(OPTS) $(SHELL) ../../makedefs; cat $?) >$@ + (set -e; echo "# DO NOT EDIT"; $(OPTS) $(SHELL) ../../makedefs && cat $?) >$@ test: $(TESTPROG) diff --git a/postfix/src/qmgr/Makefile.in b/postfix/src/qmgr/Makefile.in index ad3320b48..91f57e21f 100644 --- a/postfix/src/qmgr/Makefile.in +++ b/postfix/src/qmgr/Makefile.in @@ -23,7 +23,7 @@ $(PROG): $(OBJS) $(LIBS) $(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBS) $(SYSLIBS) Makefile: Makefile.in - (set -e; echo "# DO NOT EDIT"; $(OPTS) $(SHELL) ../../makedefs; cat $?) >$@ + (set -e; echo "# DO NOT EDIT"; $(OPTS) $(SHELL) ../../makedefs && cat $?) >$@ test: $(TESTPROG) diff --git a/postfix/src/qmgr/qmgr_queue.c b/postfix/src/qmgr/qmgr_queue.c index f210b547f..985e6118d 100644 --- a/postfix/src/qmgr/qmgr_queue.c +++ b/postfix/src/qmgr/qmgr_queue.c @@ -143,13 +143,12 @@ void qmgr_queue_unthrottle(QMGR_QUEUE *queue) /* * Increase the destination's concurrency limit until we reach the - * transport's concurrency limit. Set the destination's concurrency limit - * to the actual concurrency + 1, so that qmgr_queue_throttle() takes - * effect quickly. + * transport's concurrency limit. */ if (transport->dest_concurrency_limit == 0 - || transport->dest_concurrency_limit > queue->busy_refcount) - queue->window = queue->busy_refcount + 1; + || transport->dest_concurrency_limit > queue->window) + if (queue->window <= queue->busy_refcount) + queue->window++; } /* qmgr_queue_throttle - handle destination delivery failure */ diff --git a/postfix/src/sendmail/Makefile.in b/postfix/src/sendmail/Makefile.in index acbbef24b..0f9f5a478 100644 --- a/postfix/src/sendmail/Makefile.in +++ b/postfix/src/sendmail/Makefile.in @@ -19,7 +19,7 @@ $(PROG): $(OBJS) $(LIBS) $(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBS) $(SYSLIBS) Makefile: Makefile.in - (set -e; echo "# DO NOT EDIT"; $(OPTS) $(SHELL) ../../makedefs; cat $?) >$@ + (set -e; echo "# DO NOT EDIT"; $(OPTS) $(SHELL) ../../makedefs && cat $?) >$@ test: $(TESTPROG) diff --git a/postfix/src/showq/Makefile.in b/postfix/src/showq/Makefile.in index 3418afb2b..23d15c420 100644 --- a/postfix/src/showq/Makefile.in +++ b/postfix/src/showq/Makefile.in @@ -19,7 +19,7 @@ $(PROG): $(OBJS) $(LIBS) $(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBS) $(SYSLIBS) Makefile: Makefile.in - (set -e; echo "# DO NOT EDIT"; $(OPTS) $(SHELL) ../../makedefs; cat $?) >$@ + (set -e; echo "# DO NOT EDIT"; $(OPTS) $(SHELL) ../../makedefs && cat $?) >$@ test: $(TESTPROG) diff --git a/postfix/src/smtp/Makefile.in b/postfix/src/smtp/Makefile.in index c11599ef3..0e31ac857 100644 --- a/postfix/src/smtp/Makefile.in +++ b/postfix/src/smtp/Makefile.in @@ -23,7 +23,7 @@ $(PROG): $(OBJS) $(LIBS) $(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBS) $(SYSLIBS) Makefile: Makefile.in - (set -e; echo "# DO NOT EDIT"; $(OPTS) $(SHELL) ../../makedefs; cat $?) >$@ + (set -e; echo "# DO NOT EDIT"; $(OPTS) $(SHELL) ../../makedefs && cat $?) >$@ test: $(TESTPROG) diff --git a/postfix/src/smtpd/Makefile.in b/postfix/src/smtpd/Makefile.in index 34d6860b8..f445c15f4 100644 --- a/postfix/src/smtpd/Makefile.in +++ b/postfix/src/smtpd/Makefile.in @@ -22,7 +22,7 @@ $(PROG): $(OBJS) $(LIBS) $(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBS) $(SYSLIBS) Makefile: Makefile.in - (set -e; echo "# DO NOT EDIT"; $(OPTS) $(SHELL) ../../makedefs; cat $?) >$@ + (set -e; echo "# DO NOT EDIT"; $(OPTS) $(SHELL) ../../makedefs && cat $?) >$@ test: $(TESTPROG) diff --git a/postfix/src/smtpstone/Makefile.in b/postfix/src/smtpstone/Makefile.in index e4d73e7af..5cf7920e0 100644 --- a/postfix/src/smtpstone/Makefile.in +++ b/postfix/src/smtpstone/Makefile.in @@ -18,7 +18,7 @@ LIBS = ../../lib/libglobal.a ../../lib/libutil.a all: $(PROG) Makefile: Makefile.in - (set -e; echo "# DO NOT EDIT"; $(OPTS) $(SHELL) ../../makedefs; cat $?) >$@ + (set -e; echo "# DO NOT EDIT"; $(OPTS) $(SHELL) ../../makedefs && cat $?) >$@ smtp-sink: smtp-sink.o $(LIBS) $(CC) $(CFLAGS) -o $@ smtp-sink.o $(LIBS) $(SYSLIBS) diff --git a/postfix/src/spawn/Makefile.in b/postfix/src/spawn/Makefile.in index dad6232a4..1269837e1 100644 --- a/postfix/src/spawn/Makefile.in +++ b/postfix/src/spawn/Makefile.in @@ -19,7 +19,7 @@ $(PROG): $(OBJS) $(LIBS) $(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBS) $(SYSLIBS) Makefile: Makefile.in - (set -e; echo "# DO NOT EDIT"; $(OPTS) $(SHELL) ../../makedefs; cat $?) >$@ + (set -e; echo "# DO NOT EDIT"; $(OPTS) $(SHELL) ../../makedefs && cat $?) >$@ test: $(TESTPROG) diff --git a/postfix/src/trivial-rewrite/Makefile.in b/postfix/src/trivial-rewrite/Makefile.in index 07421aa83..1065ce0cf 100644 --- a/postfix/src/trivial-rewrite/Makefile.in +++ b/postfix/src/trivial-rewrite/Makefile.in @@ -24,7 +24,7 @@ $(PROG): $(OBJS) $(LIBS) $(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBS) $(SYSLIBS) Makefile: Makefile.in - (set -e; echo "# DO NOT EDIT"; $(OPTS) $(SHELL) ../../makedefs; cat $?) >$@ + (set -e; echo "# DO NOT EDIT"; $(OPTS) $(SHELL) ../../makedefs && cat $?) >$@ test: $(TESTPROG) diff --git a/postfix/src/util/Makefile.in b/postfix/src/util/Makefile.in index 4c3621fdc..62bf90753 100644 --- a/postfix/src/util/Makefile.in +++ b/postfix/src/util/Makefile.in @@ -87,7 +87,7 @@ INC_DIR = ../../include all: $(LIB) Makefile: Makefile.in - (set -e; echo "# DO NOT EDIT"; $(OPTS) $(SHELL) ../../makedefs; cat $?) >$@ + (set -e; echo "# DO NOT EDIT"; $(OPTS) $(SHELL) ../../makedefs && cat $?) >$@ test: $(TESTPROG) diff --git a/postfix/src/util/vstream_popen.c b/postfix/src/util/vstream_popen.c index 82a7a0c90..23294f979 100644 --- a/postfix/src/util/vstream_popen.c +++ b/postfix/src/util/vstream_popen.c @@ -124,7 +124,7 @@ typedef struct VSTREAM_POPEN_ARGS { /* vstream_parse_args - get arguments from variadic list */ -static VSTREAM *vstream_parse_args(VSTREAM_POPEN_ARGS *args, va_list ap) +static void vstream_parse_args(VSTREAM_POPEN_ARGS *args, va_list ap) { char *myname = "vstream_parse_args"; int key;