From 0ef381ff4df8448531797e9fc6c57097342f1578 Mon Sep 17 00:00:00 2001 From: Wietse Venema Date: Thu, 16 Jan 2014 00:00:00 -0500 Subject: [PATCH] postfix-2.7.16 --- postfix/HISTORY | 24 ++++++++++++++++++++++ postfix/README_FILES/MULTI_INSTANCE_README | 8 ++++---- postfix/README_FILES/SASL_README | 2 +- postfix/conf/post-install | 2 +- postfix/html/MULTI_INSTANCE_README.html | 6 +++--- postfix/html/SASL_README.html | 2 +- postfix/proto/MULTI_INSTANCE_README.html | 6 +++--- postfix/proto/SASL_README.html | 2 +- postfix/src/global/mail_version.h | 4 ++-- postfix/src/postconf/postconf.c | 2 +- postfix/src/util/dict_pcre.c | 15 +++++++++++--- 11 files changed, 53 insertions(+), 20 deletions(-) diff --git a/postfix/HISTORY b/postfix/HISTORY index 91b4b907c..fa7d56d5c 100644 --- a/postfix/HISTORY +++ b/postfix/HISTORY @@ -16165,3 +16165,27 @@ Apologies for any names omitted. each smtpd(8) process. The workaround turns off session tickets. In 2.11 we'll enable session tickets properly. Viktor Dukhovni. File: tls/tls_server.c. + +20131026 + + Future proofing: API changes in the PCRE library. File: + util/dict_pcre.c. + +20131127 + + Bugfix (introduced: 20090106): the postconf '-#' option + erased prior options. File: postconf/postconf.c. + +20131129 + + Bugfix: Makefile example in MULTI_INSTANCE_README. Viktor + Dukhovni. File: proto/MULTI_INSTANCE_README.html. + +20131220 + + Documentation: typo in SASL_README. Patrick Ben Koetter. + File: proto/SASL_README.html. + +20140104 + + Bugfix: malformed error message. File: conf/post-install. diff --git a/postfix/README_FILES/MULTI_INSTANCE_README b/postfix/README_FILES/MULTI_INSTANCE_README index 80a086c2b..8756a9d6f 100644 --- a/postfix/README_FILES/MULTI_INSTANCE_README +++ b/postfix/README_FILES/MULTI_INSTANCE_README @@ -177,7 +177,7 @@ database when none exists. generic: Makefile @echo Creating $@ @rm -f $@.tmp - @printf '%s\t%s+root=%s\n' root $MTAADMIN `uname -n` > $@.tmp + @printf '%s\t%s+root=%s\n' root ${MTAADMIN} `uname -n` > $@.tmp @mv $@.tmp generic %.cdb: % @@ -327,7 +327,7 @@ This uses the postmulti(1) command to invoke postconf(1) in the context (MAIL_CONFIG=/etc/postfix-out) of the output instance. * Lines 1-2: With "authorized_submit_users = root", the superuser can test - the postix-out instance with "postmulti -i postfix-out -x sendmail -bv + the postfix-out instance with "postmulti -i postfix-out -x sendmail -bv recipient...", but otherwise local submission remains disabled. * Lines 1-2: With "master_service_disable =", the "inet" listeners are re- @@ -492,8 +492,8 @@ Shared among all instances: $readme_directory. * Entries in /etc/passwd and /etc/group for the $mail_owner user and - $setgid_group group. The the $mail_owner user provides the mail system with - a protected (non-root) execution context. The $setgid_group group is used + $setgid_group group. The $mail_owner user provides the mail system with a + protected (non-root) execution context. The $setgid_group group is used exclusively to support the setgid postdrop(1) and postqueue(1) utilities (it mmuusstt nnoott be the primary group or secondary group of any users, including the $mail_owner user). diff --git a/postfix/README_FILES/SASL_README b/postfix/README_FILES/SASL_README index 27de01c40..181a05f85 100644 --- a/postfix/README_FILES/SASL_README +++ b/postfix/README_FILES/SASL_README @@ -445,7 +445,7 @@ to a PostgreSQL server: sql_user: username sql_passwd: secret sql_database: dbname - sql_select: SELECT password FROM users WHERE user = '%u'@'%r' + sql_select: SELECT password FROM users WHERE user = '%u@%r' NNoottee diff --git a/postfix/conf/post-install b/postfix/conf/post-install index 446c57f90..ff145607b 100644 --- a/postfix/conf/post-install +++ b/postfix/conf/post-install @@ -464,7 +464,7 @@ test -n "$create" && { case $type in [hl]) continue;; [df]) ;; - *) echo unknown type $type for $path in $daemon_directory/postfix-files1>&2; exit 1;; + *) echo unknown type $type for $path in $daemon_directory/postfix-files 1>&2; exit 1;; esac # Expand $name, and canonicalize null fields. for name in path owner group flags diff --git a/postfix/html/MULTI_INSTANCE_README.html b/postfix/html/MULTI_INSTANCE_README.html index 9bd65467f..c5e5f7e1d 100644 --- a/postfix/html/MULTI_INSTANCE_README.html +++ b/postfix/html/MULTI_INSTANCE_README.html @@ -233,7 +233,7 @@ creates a "generic" database when none exists.

generic: Makefile @echo Creating $@ @rm -f $@.tmp - @printf '%s\t%s+root=%s\n' root $MTAADMIN `uname -n` > $@.tmp + @printf '%s\t%s+root=%s\n' root ${MTAADMIN} `uname -n` > $@.tmp @mv $@.tmp generic %.cdb: % @@ -420,7 +420,7 @@ context (MAIL_CONFIG=/etc/postfix-out) of the output instance.