Changes from Bionic (Ubuntu 18.04)

diff --git a/post-install b/post-install
index 904cefa58afec57a0f2a286b1a681d58dbbf5911..25ef7e691f10ff34a0dcdfec5b345652ab09183a 100755 (executable)
--- a/post-install
+++ b/post-install
@@ -200,6 +200,11 @@
 #      IBM T.J. Watson Research
 #      P.O. Box 704
 #      Yorktown Heights, NY 10598, USA
+#
+#      Wietse Venema
+#      Google, Inc.
+#      111 8th Avenue
+#      New York, NY 10011, USA
 #--
 
 umask 022

diff --git a/postfix-files b/postfix-files
index a433f4f9a0f1b1da29385467f9b974a3da84c462..841ec5ed701de226836b71f9c0d6fa5264ccc719 100644 (file)
--- a/postfix-files
+++ b/postfix-files
@@ -49,9 +49,6 @@ $config_directory:d:root:-:755:u
 $data_directory:d:$mail_owner:-:700:uc
 $daemon_directory:d:root:-:755:u
 $queue_directory:d:root:-:755:uc
-$sample_directory:d:root:-:755:o
-$readme_directory:d:root:-:755
-$html_directory:d:root:-:755
 $queue_directory/active:d:$mail_owner:-:700:ucr
 $queue_directory/bounce:d:$mail_owner:-:700:ucr
 $queue_directory/corrupt:d:$mail_owner:-:700:ucr
@@ -67,19 +64,11 @@ $queue_directory/pid:d:root:-:755:uc
 $queue_directory/saved:d:$mail_owner:-:700:ucr
 $queue_directory/trace:d:$mail_owner:-:700:ucr
 # Update shared libraries and plugins before daemon or command-line programs.
-$shlib_directory/lib${LIB_PREFIX}util${LIB_SUFFIX}:f:root:-:755
-$shlib_directory/lib${LIB_PREFIX}global${LIB_SUFFIX}:f:root:-:755
-$shlib_directory/lib${LIB_PREFIX}dns${LIB_SUFFIX}:f:root:-:755
-$shlib_directory/lib${LIB_PREFIX}tls${LIB_SUFFIX}:f:root:-:755
-$shlib_directory/lib${LIB_PREFIX}master${LIB_SUFFIX}:f:root:-:755
-$shlib_directory/${LIB_PREFIX}cdb${LIB_SUFFIX}:f:root:-:755
-$shlib_directory/${LIB_PREFIX}ldap${LIB_SUFFIX}:f:root:-:755
-$shlib_directory/${LIB_PREFIX}lmdb${LIB_SUFFIX}:f:root:-:755
-$shlib_directory/${LIB_PREFIX}mysql${LIB_SUFFIX}:f:root:-:755
-$shlib_directory/${LIB_PREFIX}pcre${LIB_SUFFIX}:f:root:-:755
-$shlib_directory/${LIB_PREFIX}pgsql${LIB_SUFFIX}:f:root:-:755
-$shlib_directory/${LIB_PREFIX}sdbm${LIB_SUFFIX}:f:root:-:755
-$shlib_directory/${LIB_PREFIX}sqlite${LIB_SUFFIX}:f:root:-:755
+$shlib_directory/libpostfix-util.so:f:root:-:755
+$shlib_directory/libpostfix-global.so:f:root:-:755
+$shlib_directory/libpostfix-dns.so:f:root:-:755
+$shlib_directory/libpostfix-tls.so:f:root:-:755
+$shlib_directory/libpostfix-master.so:f:root:-:755
 $meta_directory/dynamicmaps.cf.d:d:root:-:755
 $meta_directory/dynamicmaps.cf:f:root:-:644
 $meta_directory/main.cf.proto:f:root:-:644
@@ -140,317 +129,93 @@ $command_directory/postqueue:f:root:$setgid_group:2755:u
 $sendmail_path:f:root:-:755
 $newaliases_path:l:$sendmail_path
 $mailq_path:l:$sendmail_path
-$config_directory/LICENSE:f:root:-:644:1
-$config_directory/TLS_LICENSE:f:root:-:644:1
-$config_directory/access:f:root:-:644:p1
-$config_directory/aliases:f:root:-:644:p1
-$config_directory/bounce.cf.default:f:root:-:644:1
-$config_directory/canonical:f:root:-:644:p1
-$config_directory/cidr_table:f:root:-:644:o
-$config_directory/generic:f:root:-:644:p1
-$config_directory/generics:f:root:-:644:o
-$config_directory/header_checks:f:root:-:644:p1
-$config_directory/install.cf:f:root:-:644:o
-$config_directory/main.cf.default:f:root:-:644:1
+# Empty files not shipped in Debian
+#$config_directory/access:f:root:-:644:p1
+#$config_directory/aliases:f:root:-:644:p1
+#$config_directory/bounce.cf.default:f:root:-:644:1
+#$config_directory/canonical:f:root:-:644:p1
+#$config_directory/cidr_table:f:root:-:644:o
+#$config_directory/generic:f:root:-:644:p1
+#$config_directory/generics:f:root:-:644:o
+#$config_directory/header_checks:f:root:-:644:p1
+#$config_directory/install.cf:f:root:-:644:o
+#$config_directory/main.cf.default:f:root:-:644:1
 $config_directory/main.cf:f:root:-:644:p
 $config_directory/master.cf:f:root:-:644:p
-$config_directory/pcre_table:f:root:-:644:o
-$config_directory/regexp_table:f:root:-:644:o
-$config_directory/relocated:f:root:-:644:p1
-$config_directory/tcp_table:f:root:-:644:o
-$config_directory/transport:f:root:-:644:p1
-$config_directory/virtual:f:root:-:644:p1
+#$config_directory/regexp_table:f:root:-:644:o
+#$config_directory/relocated:f:root:-:644:p1
+#$config_directory/tcp_table:f:root:-:644:o
+#$config_directory/transport:f:root:-:644:p1
+#$config_directory/virtual:f:root:-:644:p1
 $config_directory/postfix-script:f:root:-:755:o
-$config_directory/postfix-script-sgid:f:root:-:755:o
-$config_directory/postfix-script-nosgid:f:root:-:755:o
+#$config_directory/postfix-script-sgid:f:root:-:755:o
+#$config_directory/postfix-script-nosgid:f:root:-:755:o
 $config_directory/post-install:f:root:-:755:o
-$manpage_directory/man1/mailq.1:f:root:-:644
-$manpage_directory/man1/newaliases.1:f:root:-:644
-$manpage_directory/man1/postalias.1:f:root:-:644
-$manpage_directory/man1/postcat.1:f:root:-:644
-$manpage_directory/man1/postconf.1:f:root:-:644
-$manpage_directory/man1/postdrop.1:f:root:-:644
-$manpage_directory/man1/postfix.1:f:root:-:644
-$manpage_directory/man1/postfix-tls.1:f:root:-:644
-$manpage_directory/man1/postkick.1:f:root:-:644
-$manpage_directory/man1/postlock.1:f:root:-:644
-$manpage_directory/man1/postlog.1:f:root:-:644
-$manpage_directory/man1/postmap.1:f:root:-:644
-$manpage_directory/man1/postmulti.1:f:root:-:644
-$manpage_directory/man1/postqueue.1:f:root:-:644
-$manpage_directory/man1/postsuper.1:f:root:-:644
-$manpage_directory/man1/sendmail.1:f:root:-:644
-$manpage_directory/man5/access.5:f:root:-:644
-$manpage_directory/man5/aliases.5:f:root:-:644
-$manpage_directory/man5/body_checks.5:f:root:-:644
-$manpage_directory/man5/bounce.5:f:root:-:644
-$manpage_directory/man5/canonical.5:f:root:-:644
-$manpage_directory/man5/cidr_table.5:f:root:-:644
-$manpage_directory/man5/generics.5:f:root:-:644:o
-$manpage_directory/man5/generic.5:f:root:-:644
-$manpage_directory/man5/header_checks.5:f:root:-:644
-$manpage_directory/man5/ldap_table.5:f:root:-:644
-$manpage_directory/man5/lmdb_table.5:f:root:-:644
-$manpage_directory/man5/master.5:f:root:-:644
-$manpage_directory/man5/memcache_table.5:f:root:-:644
-$manpage_directory/man5/mysql_table.5:f:root:-:644
-$manpage_directory/man5/socketmap_table.5:f:root:-:644
-$manpage_directory/man5/sqlite_table.5:f:root:-:644
-$manpage_directory/man5/nisplus_table.5:f:root:-:644
-$manpage_directory/man5/pcre_table.5:f:root:-:644
-$manpage_directory/man5/pgsql_table.5:f:root:-:644
-$manpage_directory/man5/postconf.5:f:root:-:644
-$manpage_directory/man5/postfix-wrapper.5:f:root:-:644
-$manpage_directory/man5/regexp_table.5:f:root:-:644
-$manpage_directory/man5/relocated.5:f:root:-:644
-$manpage_directory/man5/tcp_table.5:f:root:-:644
-$manpage_directory/man5/transport.5:f:root:-:644
-$manpage_directory/man5/virtual.5:f:root:-:644
-$manpage_directory/man8/bounce.8:f:root:-:644
-$manpage_directory/man8/cleanup.8:f:root:-:644
-$manpage_directory/man8/anvil.8:f:root:-:644
-$manpage_directory/man8/defer.8:f:root:-:644
-$manpage_directory/man8/discard.8:f:root:-:644
-$manpage_directory/man8/dnsblog.8:f:root:-:644
-$manpage_directory/man8/error.8:f:root:-:644
-$manpage_directory/man8/flush.8:f:root:-:644
-$manpage_directory/man8/lmtp.8:f:root:-:644
-$manpage_directory/man8/local.8:f:root:-:644
-$manpage_directory/man8/master.8:f:root:-:644
-$manpage_directory/man8/nqmgr.8:f:root:-:644:o
-$manpage_directory/man8/oqmgr.8:f:root:-:644:
-$manpage_directory/man8/pickup.8:f:root:-:644
-$manpage_directory/man8/pipe.8:f:root:-:644
-$manpage_directory/man8/postscreen.8:f:root:-:644
-$manpage_directory/man8/proxymap.8:f:root:-:644
-$manpage_directory/man8/qmgr.8:f:root:-:644
-$manpage_directory/man8/qmqpd.8:f:root:-:644
-$manpage_directory/man8/scache.8:f:root:-:644
-$manpage_directory/man8/showq.8:f:root:-:644
-$manpage_directory/man8/smtp.8:f:root:-:644
-$manpage_directory/man8/smtpd.8:f:root:-:644
-$manpage_directory/man8/spawn.8:f:root:-:644
-$manpage_directory/man8/tlsproxy.8:f:root:-:644
-$manpage_directory/man8/tlsmgr.8:f:root:-:644
-$manpage_directory/man8/trace.8:f:root:-:644
-$manpage_directory/man8/trivial-rewrite.8:f:root:-:644
-$manpage_directory/man8/verify.8:f:root:-:644
-$manpage_directory/man8/virtual.8:f:root:-:644
-$sample_directory/sample-aliases.cf:f:root:-:644:o
-$sample_directory/sample-auth.cf:f:root:-:644:o
-$sample_directory/sample-canonical.cf:f:root:-:644:o
-$sample_directory/sample-compatibility.cf:f:root:-:644:o
-$sample_directory/sample-debug.cf:f:root:-:644:o
-$sample_directory/sample-filter.cf:f:root:-:644:o
-$sample_directory/sample-flush.cf:f:root:-:644:o
-$sample_directory/sample-ipv6.cf:f:root:-:644:o
-$sample_directory/sample-ldap.cf:f:root:-:644:o
-$sample_directory/sample-lmtp.cf:f:root:-:644:o
-$sample_directory/sample-local.cf:f:root:-:644:o
-$sample_directory/sample-mime.cf:f:root:-:644:o
-$sample_directory/sample-misc.cf:f:root:-:644:o
-$sample_directory/sample-pcre-access.cf:f:root:-:644:o
-$sample_directory/sample-pcre-body.cf:f:root:-:644:o
-$sample_directory/sample-pcre-header.cf:f:root:-:644:o
-$sample_directory/sample-pgsql-aliases.cf:f:root:-:644:o
-$sample_directory/sample-qmqpd.cf:f:root:-:644:o
-$sample_directory/sample-rate.cf:f:root:-:644:o
-$sample_directory/sample-regexp-access.cf:f:root:-:644:o
-$sample_directory/sample-regexp-body.cf:f:root:-:644:o
-$sample_directory/sample-regexp-header.cf:f:root:-:644:o
-$sample_directory/sample-relocated.cf:f:root:-:644:o
-$sample_directory/sample-resource.cf:f:root:-:644:o
-$sample_directory/sample-rewrite.cf:f:root:-:644:o
-$sample_directory/sample-scheduler.cf:f:root:-:644:o
-$sample_directory/sample-smtp.cf:f:root:-:644:o
-$sample_directory/sample-smtpd.cf:f:root:-:644:o
-$sample_directory/sample-tls.cf:f:root:-:644:o
-$sample_directory/sample-transport.cf:f:root:-:644:o
-$sample_directory/sample-verify.cf:f:root:-:644:o
-$sample_directory/sample-virtual.cf:f:root:-:644:o
-$readme_directory/AAAREADME:f:root:-:644
-$readme_directory/ADDRESS_CLASS_README:f:root:-:644
-$readme_directory/ADDRESS_REWRITING_README:f:root:-:644
-$readme_directory/ADDRESS_VERIFICATION_README:f:root:-:644
-$readme_directory/BACKSCATTER_README:f:root:-:644
-$readme_directory/BASIC_CONFIGURATION_README:f:root:-:644
-$readme_directory/BUILTIN_FILTER_README:f:root:-:644
-$readme_directory/CDB_README:f:root:-:644
-$readme_directory/COMPATIBILITY_README:f:root:-:644
-$readme_directory/CONNECTION_CACHE_README:f:root:-:644
-$readme_directory/CONTENT_INSPECTION_README:f:root:-:644
-$readme_directory/DATABASE_README:f:root:-:644
-$readme_directory/DB_README:f:root:-:644
-$readme_directory/DEBUG_README:f:root:-:644
-$readme_directory/DSN_README:f:root:-:644
-$readme_directory/ETRN_README:f:root:-:644
-$readme_directory/FILTER_README:f:root:-:644
-$readme_directory/FORWARD_SECRECY_README:f:root:-:644
-$readme_directory/HOSTING_README:f:root:-:644:o
-$readme_directory/INSTALL:f:root:-:644
-$readme_directory/IPV6_README:f:root:-:644
-$readme_directory/LDAP_README:f:root:-:644
-$readme_directory/LINUX_README:f:root:-:644
-$readme_directory/LMDB_README:f:root:-:644
-$readme_directory/LOCAL_RECIPIENT_README:f:root:-:644
-$readme_directory/MACOSX_README:f:root:-:644:o
-$readme_directory/MAILDROP_README:f:root:-:644
-$readme_directory/MEMCACHE_README:f:root:-:644
-$readme_directory/MILTER_README:f:root:-:644
-$readme_directory/MULTI_INSTANCE_README:f:root:-:644
-$readme_directory/MYSQL_README:f:root:-:644
-$readme_directory/SQLITE_README:f:root:-:644
-$readme_directory/NFS_README:f:root:-:644
-$readme_directory/OVERVIEW:f:root:-:644
-$readme_directory/PACKAGE_README:f:root:-:644
-$readme_directory/PCRE_README:f:root:-:644
-$readme_directory/PGSQL_README:f:root:-:644
-$readme_directory/POSTSCREEN_README:f:root:-:644
-$readme_directory/QMQP_README:f:root:-:644:o
-$readme_directory/QSHAPE_README:f:root:-:644
-$readme_directory/RELEASE_NOTES:f:root:-:644
-$readme_directory/RESTRICTION_CLASS_README:f:root:-:644
-$readme_directory/SASL_README:f:root:-:644
-$readme_directory/SCHEDULER_README:f:root:-:644
-$readme_directory/SMTPD_ACCESS_README:f:root:-:644
-$readme_directory/SMTPD_POLICY_README:f:root:-:644
-$readme_directory/SMTPD_PROXY_README:f:root:-:644
-$readme_directory/SOHO_README:f:root:-:644
-$readme_directory/STANDARD_CONFIGURATION_README:f:root:-:644
-$readme_directory/STRESS_README:f:root:-:644
-$readme_directory/TLS_LEGACY_README:f:root:-:644
-$readme_directory/TLS_README:f:root:-:644
-$readme_directory/TUNING_README:f:root:-:644
-$readme_directory/ULTRIX_README:f:root:-:644
-$readme_directory/UUCP_README:f:root:-:644
-$readme_directory/VERP_README:f:root:-:644
-$readme_directory/VIRTUAL_README:f:root:-:644
-$readme_directory/XCLIENT_README:f:root:-:644
-$readme_directory/XFORWARD_README:f:root:-:644
-$html_directory/ADDRESS_CLASS_README.html:f:root:-:644
-$html_directory/ADDRESS_REWRITING_README.html:f:root:-:644
-$html_directory/ADDRESS_VERIFICATION_README.html:f:root:-:644
-$html_directory/BACKSCATTER_README.html:f:root:-:644
-$html_directory/BASIC_CONFIGURATION_README.html:f:root:-:644
-$html_directory/BUILTIN_FILTER_README.html:f:root:-:644
-$html_directory/CDB_README.html:f:root:-:644
-$html_directory/COMPATIBILITY_README.html:f:root:-:644
-$html_directory/CONNECTION_CACHE_README.html:f:root:-:644
-$html_directory/CONTENT_INSPECTION_README.html:f:root:-:644
-$html_directory/CYRUS_README.html:f:root:-:644:o
-$html_directory/DATABASE_README.html:f:root:-:644
-$html_directory/DB_README.html:f:root:-:644
-$html_directory/DEBUG_README.html:f:root:-:644
-$html_directory/DSN_README.html:f:root:-:644
-$html_directory/ETRN_README.html:f:root:-:644
-$html_directory/FILTER_README.html:f:root:-:644
-$html_directory/FORWARD_SECRECY_README.html:f:root:-:644
-$html_directory/INSTALL.html:f:root:-:644
-$html_directory/IPV6_README.html:f:root:-:644
-$html_directory/LDAP_README.html:f:root:-:644
-$html_directory/LINUX_README.html:f:root:-:644
-$html_directory/LMDB_README.html:f:root:-:644
-$html_directory/LOCAL_RECIPIENT_README.html:f:root:-:644
-$html_directory/MAILDROP_README.html:f:root:-:644
-$html_directory/MILTER_README.html:f:root:-:644
-$html_directory/MULTI_INSTANCE_README.html:f:root:-:644
-$html_directory/MYSQL_README.html:f:root:-:644
-$html_directory/SQLITE_README.html:f:root:-:644
-$html_directory/NFS_README.html:f:root:-:644
-$html_directory/OVERVIEW.html:f:root:-:644
-$html_directory/PACKAGE_README.html:f:root:-:644
-$html_directory/PCRE_README.html:f:root:-:644
-$html_directory/PGSQL_README.html:f:root:-:644
-$html_directory/POSTSCREEN_README.html:f:root:-:644
-$html_directory/QMQP_README.html:f:root:-:644:o
-$html_directory/QSHAPE_README.html:f:root:-:644
-$html_directory/RESTRICTION_CLASS_README.html:f:root:-:644
-$html_directory/SASL_README.html:f:root:-:644
-$html_directory/SCHEDULER_README.html:f:root:-:644
-$html_directory/SMTPD_ACCESS_README.html:f:root:-:644
-$html_directory/SMTPD_POLICY_README.html:f:root:-:644
-$html_directory/SMTPD_PROXY_README.html:f:root:-:644
-$html_directory/SOHO_README.html:f:root:-:644
-$html_directory/STANDARD_CONFIGURATION_README.html:f:root:-:644
-$html_directory/STRESS_README.html:f:root:-:644
-$html_directory/TLS_LEGACY_README.html:f:root:-:644
-$html_directory/TLS_README.html:f:root:-:644
-$html_directory/TUNING_README.html:f:root:-:644
-$html_directory/ULTRIX_README.html:f:root:-:644:o
-$html_directory/UUCP_README.html:f:root:-:644
-$html_directory/VERP_README.html:f:root:-:644
-$html_directory/VIRTUAL_README.html:f:root:-:644
-$html_directory/XCLIENT_README.html:f:root:-:644
-$html_directory/XFORWARD_README.html:f:root:-:644
-$html_directory/access.5.html:f:root:-:644
-$html_directory/aliases.5.html:f:root:-:644
-$html_directory/anvil.8.html:f:root:-:644
-$html_directory/bounce.8.html:f:root:-:644
-$html_directory/canonical.5.html:f:root:-:644
-$html_directory/cidr_table.5.html:f:root:-:644
-$html_directory/cleanup.8.html:f:root:-:644
-$html_directory/defer.8.html:h:$html_directory/bounce.8.html:-:644
-$html_directory/discard.8.html:f:root:-:644
-$html_directory/dnsblog.8.html:f:root:-:644
-$html_directory/error.8.html:f:root:-:644
-$html_directory/flush.8.html:f:root:-:644
-$html_directory/generics.5.html:f:root:-:644:o
-$html_directory/generic.5.html:f:root:-:644
-$html_directory/header_checks.5.html:f:root:-:644
-$html_directory/index.html:f:root:-:644
-$html_directory/ldap_table.5.html:f:root:-:644
-$html_directory/lmtp.8.html:f:root:-:644
-$html_directory/local.8.html:f:root:-:644
-$html_directory/mailq.1.html:f:root:-:644
-$html_directory/master.5.html:f:root:-:644
-$html_directory/master.8.html:f:root:-:644
-$html_directory/memcache_table.5.html:f:root:-:644
-$html_directory/mysql_table.5.html:f:root:-:644
-$html_directory/sqlite_table.5.html:f:root:-:644
-$html_directory/nisplus_table.5.html:f:root:-:644
-$html_directory/newaliases.1.html:h:$html_directory/mailq.1.html:-:644
-$html_directory/oqmgr.8.html:f:root:-:644
-$html_directory/pcre_table.5.html:f:root:-:644
-$html_directory/pgsql_table.5.html:f:root:-:644
-$html_directory/pickup.8.html:f:root:-:644
-$html_directory/pipe.8.html:f:root:-:644
-$html_directory/postalias.1.html:f:root:-:644
-$html_directory/postcat.1.html:f:root:-:644
-$html_directory/postconf.1.html:f:root:-:644
-$html_directory/postconf.5.html:f:root:-:644
-$html_directory/postdrop.1.html:f:root:-:644
-$html_directory/postfix-logo.jpg:f:root:-:644
-$html_directory/postfix-manuals.html:f:root:-:644
-$html_directory/postfix-wrapper.5.html:f:root:-:644
-$html_directory/postfix.1.html:f:root:-:644
-$html_directory/postkick.1.html:f:root:-:644
-$html_directory/postlock.1.html:f:root:-:644
-$html_directory/postlog.1.html:f:root:-:644
-$html_directory/postmap.1.html:f:root:-:644
-$html_directory/postmulti.1.html:f:root:-:644
-$html_directory/postqueue.1.html:f:root:-:644
-$html_directory/postscreen.8.html:f:root:-:644
-$html_directory/postsuper.1.html:f:root:-:644
-$html_directory/qshape.1.html:f:root:-:644
-$html_directory/proxymap.8.html:f:root:-:644
-$html_directory/qmgr.8.html:f:root:-:644
-$html_directory/qmqp-sink.1.html:f:root:-:644
-$html_directory/qmqp-source.1.html:f:root:-:644
-$html_directory/qmqpd.8.html:f:root:-:644
-$html_directory/regexp_table.5.html:f:root:-:644
-$html_directory/relocated.5.html:f:root:-:644
-$html_directory/sendmail.1.html:h:$html_directory/mailq.1.html:-:644
-$html_directory/showq.8.html:f:root:-:644
-$html_directory/smtp-sink.1.html:f:root:-:644
-$html_directory/smtp-source.1.html:f:root:-:644
-$html_directory/smtp.8.html:h:$html_directory/lmtp.8.html:-:644
-$html_directory/smtpd.8.html:f:root:-:644
-$html_directory/spawn.8.html:f:root:-:644
-$html_directory/tlsproxy.8.html:f:root:-:644
-$html_directory/tcp_table.5.html:f:root:-:644
-$html_directory/trace.8.html:h:$html_directory/bounce.8.html:-:644
-$html_directory/transport.5.html:f:root:-:644
-$html_directory/trivial-rewrite.8.html:f:root:-:644
-$html_directory/verify.8.html:f:root:-:644
-$html_directory/virtual.5.html:f:root:-:644
-$html_directory/virtual.8.html:f:root:-:644
+$manpage_directory/man1/mailq.1.gz:f:root:-:644
+$manpage_directory/man1/newaliases.1.gz:f:root:-:644
+$manpage_directory/man1/postalias.1.gz:f:root:-:644
+$manpage_directory/man1/postcat.1.gz:f:root:-:644
+$manpage_directory/man1/postconf.1.gz:f:root:-:644
+$manpage_directory/man1/postdrop.1.gz:f:root:-:644
+$manpage_directory/man1/postfix.1.gz:f:root:-:644
+$manpage_directory/man1/postfix-tls.1.gz:f:root:-:644
+$manpage_directory/man1/postkick.1.gz:f:root:-:644
+$manpage_directory/man1/postlock.1.gz:f:root:-:644
+$manpage_directory/man1/postlog.1.gz:f:root:-:644
+$manpage_directory/man1/postmap.1.gz:f:root:-:644
+$manpage_directory/man1/postmulti.1.gz:f:root:-:644
+$manpage_directory/man1/postqueue.1.gz:f:root:-:644
+$manpage_directory/man1/postsuper.1.gz:f:root:-:644
+$manpage_directory/man1/sendmail.1.gz:f:root:-:644
+$manpage_directory/man5/access.5.gz:f:root:-:644
+$manpage_directory/man5/aliases.5.gz:f:root:-:644
+$manpage_directory/man5/body_checks.5.gz:f:root:-:644
+$manpage_directory/man5/bounce.5.gz:f:root:-:644
+$manpage_directory/man5/canonical.5.gz:f:root:-:644
+$manpage_directory/man5/cidr_table.5.gz:f:root:-:644
+$manpage_directory/man5/generics.5.gz:f:root:-:644:o
+$manpage_directory/man5/generic.5.gz:f:root:-:644
+$manpage_directory/man5/header_checks.5.gz:f:root:-:644
+$manpage_directory/man5/master.5.gz:f:root:-:644
+$manpage_directory/man5/memcache_table.5.gz:f:root:-:644
+$manpage_directory/man5/socketmap_table.5.gz:f:root:-:644
+$manpage_directory/man5/nisplus_table.5.gz:f:root:-:644
+$manpage_directory/man5/postconf.5.gz:f:root:-:644
+$manpage_directory/man5/postfix-wrapper.5.gz:f:root:-:644
+$manpage_directory/man5/regexp_table.5.gz:f:root:-:644
+$manpage_directory/man5/relocated.5.gz:f:root:-:644
+$manpage_directory/man5/tcp_table.5.gz:f:root:-:644
+$manpage_directory/man5/transport.5.gz:f:root:-:644
+$manpage_directory/man5/virtual.5.gz:f:root:-:644
+$manpage_directory/man8/bounce.8postfix.gz:f:root:-:644
+$manpage_directory/man8/cleanup.8postfix.gz:f:root:-:644
+$manpage_directory/man8/anvil.8postfix.gz:f:root:-:644
+$manpage_directory/man8/defer.8postfix.gz:f:root:-:644
+$manpage_directory/man8/discard.8postfix.gz:f:root:-:644
+$manpage_directory/man8/dnsblog.8postfix.gz:f:root:-:644
+$manpage_directory/man8/error.8postfix.gz:f:root:-:644
+$manpage_directory/man8/flush.8postfix.gz:f:root:-:644
+$manpage_directory/man8/lmtp.8postfix.gz:f:root:-:644
+$manpage_directory/man8/local.8postfix.gz:f:root:-:644
+$manpage_directory/man8/master.8postfix.gz:f:root:-:644
+$manpage_directory/man8/nqmgr.8postfix.gz:f:root:-:644:o
+$manpage_directory/man8/oqmgr.8postfix.gz:f:root:-:644:
+$manpage_directory/man8/pickup.8postfix.gz:f:root:-:644
+$manpage_directory/man8/pipe.8postfix.gz:f:root:-:644
+$manpage_directory/man8/postfix-add-filter.8.gz:f:root:-:644
+$manpage_directory/man8/postfix-add-policy.8.gz:f:root:-:644
+$manpage_directory/man8/postscreen.8postfix.gz:f:root:-:644
+$manpage_directory/man8/proxymap.8postfix.gz:f:root:-:644
+$manpage_directory/man8/qmgr.8postfix.gz:f:root:-:644
+$manpage_directory/man8/qmqpd.8postfix.gz:f:root:-:644
+$manpage_directory/man8/scache.8postfix.gz:f:root:-:644
+$manpage_directory/man8/showq.8postfix.gz:f:root:-:644
+$manpage_directory/man8/smtp.8postfix.gz:f:root:-:644
+$manpage_directory/man8/smtpd.8postfix.gz:f:root:-:644
+$manpage_directory/man8/spawn.8postfix.gz:f:root:-:644
+$manpage_directory/man8/tlsproxy.8postfix.gz:f:root:-:644
+$manpage_directory/man8/tlsmgr.8postfix.gz:f:root:-:644
+$manpage_directory/man8/trace.8postfix.gz:f:root:-:644
+$manpage_directory/man8/trivial-rewrite.8postfix.gz:f:root:-:644
+$manpage_directory/man8/verify.8postfix.gz:f:root:-:644
+$manpage_directory/man8/virtual.8postfix.gz:f:root:-:644

diff --git a/postfix-script b/postfix-script
index e4016a6ac74b874a4d5fdaf50a10a7d1a7115c15..dc8b83fa6b5643e0aac14a2f7d768b08dd3cfe39 100755 (executable)
--- a/postfix-script
+++ b/postfix-script
@@ -23,6 +23,11 @@
 #      IBM T.J. Watson Research
 #      P.O. Box 704
 #      Yorktown Heights, NY 10598, USA
+#
+#      Wietse Venema
+#      Google, Inc.
+#      111 8th Avenue
+#      New York, NY 10011, USA
 #--
 
 # Avoid POSIX death due to SIGHUP when some parent process exits.
@@ -126,19 +131,19 @@ stop_msg)
 
 quick-start)
 
-       $daemon_directory/master -t 2>/dev/null || {
-               $FATAL the Postfix mail system is already running
-               exit 1
-       }
-       $daemon_directory/postfix-script quick-check || {
-               $FATAL Postfix integrity check failed!
-               exit 1
-       }
-       $INFO starting the Postfix mail system
-       $daemon_directory/master &
-       ;;
+       $daemon_directory/master -t 2>/dev/null || {
+               $FATAL the Postfix mail system is already running
+               exit 1
+       }
+       $daemon_directory/postfix-script quick-check || {
+               $FATAL Postfix integrity check failed!
+               exit 1
+       }
+       $INFO starting the Postfix mail system
+       $daemon_directory/master &
+       ;;
 
-start)
+start|start-fg)
 
        $daemon_directory/master -t 2>/dev/null || {
                $FATAL the Postfix mail system is already running
@@ -156,11 +161,28 @@ start)
                $daemon_directory/postfix-script check-warn
        fi
        $INFO starting the Postfix mail system
-       # NOTE: wait in foreground process to get the initialization status.
-       $daemon_directory/master -w || {
-           $FATAL "mail system startup failed"
-           exit 1
-       }
+       case $1 in
+       start)
+           # NOTE: wait in foreground process to get the initialization status.
+           $daemon_directory/master -w || {
+               $FATAL "mail system startup failed"
+               exit 1
+           }
+           ;;
+       start-fg)
+           # Foreground start-up is incompatible with multi-instance mode.
+           # We can't use "exec $daemon_directory/master" here: that would
+           # break process group management, and "postfix stop" would kill
+           # too many processes.
+           case $instances in
+           "") $daemon_directory/master
+               ;;
+            *) $FATAL "start-fg does not support multi_instance_directories"
+               exit 1
+               ;;
+           esac
+           ;;
+       esac
        ;;
 
 drain)
@@ -302,9 +324,14 @@ check-warn)
        find $todo ! -user root \
            -exec $WARN not owned by root: {} \;
 
-       find $todo \( -perm -020 -o -perm -002 \) \
+       # Handle symlinks separately
+       find -L $todo \( -perm -020 -o -perm -002 \) \
            -exec $WARN group or other writable: {} \;
 
+       find $todo -type l | while read f; do \
+           readlink "$f" | grep -q / && $WARN symlink leaves directory: "$f"; \
+       done; \
+
        # Check Postfix mail_owner-owned directory tree owner/permissions.
 
        find $data_directory/. ! -user $mail_owner \
@@ -394,8 +421,7 @@ tls)
        ;;
 
 *)
-       $ERROR "unknown command: '$1'"
-       $FATAL "usage: postfix start (or stop, reload, abort, flush, check, status, set-permissions, upgrade-configuration)"
+       $FATAL "unknown command: '$1'. Usage: postfix start (or stop, reload, abort, flush, check, status, set-permissions, upgrade-configuration)"
        exit 1
        ;;