Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/gnu/dist/postfix resolve conflicts
details: https://anonhg.NetBSD.org/src/rev/bfaa89d13ac8
branches: trunk
changeset: 544015:bfaa89d13ac8
user: perry <perry%NetBSD.org@localhost>
date: Sat Mar 08 19:43:56 2003 +0000
description:
resolve conflicts
diffstat:
gnu/dist/postfix/conf/main.cf | 24 ++++-
gnu/dist/postfix/conf/master.cf | 49 +++++-----
gnu/dist/postfix/conf/post-install | 10 ++-
gnu/dist/postfix/conf/sample-local.cf | 6 +-
gnu/dist/postfix/conf/sample-misc.cf | 8 +-
gnu/dist/postfix/conf/sample-pcre-body.cf | 5 +-
gnu/dist/postfix/conf/sample-pcre-header.cf | 9 +-
gnu/dist/postfix/conf/sample-regexp-body.cf | 5 +-
gnu/dist/postfix/conf/sample-regexp-header.cf | 8 +-
gnu/dist/postfix/conf/sample-smtpd.cf | 75 +++++++++++++++++-
gnu/dist/postfix/makedefs | 30 +++++-
gnu/dist/postfix/src/global/Makefile.in | 35 +++++++-
gnu/dist/postfix/src/global/mail_params.h | 22 ++++-
gnu/dist/postfix/src/global/tok822_parse.c | 113 +++++++++++++++++++++++--
gnu/dist/postfix/src/master/master_ent.c | 2 +
gnu/dist/postfix/src/qmgr/qmgr_message.c | 24 +----
gnu/dist/postfix/src/smtp/smtp_connect.c | 3 +-
gnu/dist/postfix/src/smtpd/smtpd.c | 13 ++-
gnu/dist/postfix/src/smtpd/smtpd_check.c | 25 ++++-
gnu/dist/postfix/src/util/Makefile.in | 12 ++
20 files changed, 375 insertions(+), 103 deletions(-)
diffs (truncated from 1028 to 300 lines):
diff -r 609906ecc4e0 -r bfaa89d13ac8 gnu/dist/postfix/conf/main.cf
--- a/gnu/dist/postfix/conf/main.cf Sat Mar 08 19:12:16 2003 +0000
+++ b/gnu/dist/postfix/conf/main.cf Sat Mar 08 19:43:56 2003 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: main.cf,v 1.5 2002/12/24 20:26:59 perry Exp $
+# $NetBSD: main.cf,v 1.6 2003/03/08 19:43:57 perry Exp $
#
# Global Postfix configuration file. This file lists only a subset
# of all 250+ parameters. See the sample-xxx.cf files for a full list.
@@ -174,21 +174,29 @@
#
# - You define $mydestination domain recipients in files other than
# /etc/passwd, /etc/aliases, or the $virtual_alias_maps files.
-# For example, you define $mydestination domain recipients in
+# For example, you define $mydestination domain recipients in
# the $virtual_mailbox_maps files.
#
-# - You redefined the local delivery agent in master.cf.
+# - You redefine the local delivery agent in master.cf.
#
-# - You redefined the "local_transport" setting in main.cf.
+# - You redefine the "local_transport" setting in main.cf.
#
# - You use the "luser_relay", "mailbox_transport", or "fallback_transport"
# feature of the Postfix local delivery agent (see sample-local.cf).
#
+# Details are described in the LOCAL_RECIPIENT_README file.
+#
# Beware: if the Postfix SMTP server runs chrooted, you probably have
-# to copy the passwd (not shadow) database into the jail, and perhaps
-# other files. This is system dependent.
+# to access the passwd file via the proxymap service, in order to
+# overcome chroot restrictions. The alternative, having a copy of
+# the system passwd file in the chroot jail is just not practical.
+#
+# The right-hand side of the lookup tables is conveniently ignored.
+# In the left-hand side, specify a bare username, an @domain.tld
+# wild-card, or specify a user%domain.tld@localhost address.
#
#local_recipient_maps = unix:passwd.byname $alias_maps
+#local_recipient_maps = proxy:unix:passwd.byname $alias_maps
#local_recipient_maps =
# The unknown_local_recipient_reject_code specifies the SMTP server
@@ -305,6 +313,10 @@
#
# If this parameter is defined, then the SMTP server will reject
# mail for unknown relay users. This feature is off by default.
+#
+# The right-hand side of the lookup tables is conveniently ignored.
+# In the left-hand side, specify an @domain.tld wild-card, or specify
+# a user%domain.tld@localhost address.
#
#relay_recipient_maps = hash:/etc/postfix/relay_recipients
diff -r 609906ecc4e0 -r bfaa89d13ac8 gnu/dist/postfix/conf/master.cf
--- a/gnu/dist/postfix/conf/master.cf Sat Mar 08 19:12:16 2003 +0000
+++ b/gnu/dist/postfix/conf/master.cf Sat Mar 08 19:43:56 2003 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: master.cf,v 1.2 2002/12/24 21:37:43 perry Exp $
+# $NetBSD: master.cf,v 1.3 2003/03/08 19:43:57 perry Exp $
#
#
# Postfix master process configuration file. Each line describes how
@@ -68,27 +68,28 @@
# DO NOT SHARE THE POSTFIX QUEUE BETWEEN MULTIPLE POSTFIX INSTANCES.
#
# ==========================================================================
-# service type private unpriv chroot wakeup maxproc command + args
-# (yes) (yes) (yes) (never) (100)
+# service type private unpriv chroot wakeup maxproc command + args
+# (yes) (yes) (yes) (never) (100)
# ==========================================================================
-smtp inet n - n - - smtpd
-#628 inet n - n - - qmqpd
-pickup fifo n - n 60 1 pickup
-cleanup unix n - n - 0 cleanup
-qmgr fifo n - n 300 1 qmgr
-#qmgr fifo n - n 300 1 nqmgr
-rewrite unix - - n - - trivial-rewrite
-bounce unix - - n - 0 bounce
-defer unix - - n - 0 bounce
-flush unix n - n 1000? 0 flush
-smtp unix - - n - - smtp
-relay unix - - n - - smtp
-# -o smtp_helo_timeout=5 -o smtp_connect_timeout=5
-showq unix n - n - - showq
-error unix - - n - - error
-local unix - n n - - local
-virtual unix - n n - - virtual
-lmtp unix - - n - - lmtp
+smtp inet n - n - - smtpd
+#628 inet n - n - - qmqpd
+pickup fifo n - n 60 1 pickup
+cleanup unix n - n - 0 cleanup
+qmgr fifo n - n 300 1 qmgr
+#qmgr fifo n - n 300 1 nqmgr
+rewrite unix - - n - - trivial-rewrite
+bounce unix - - n - 0 bounce
+defer unix - - n - 0 bounce
+flush unix n - n 1000? 0 flush
+proxymap unix - - n - - proxymap
+smtp unix - - n - - smtp
+relay unix - - n - - smtp
+# -o smtp_helo_timeout=5 -o smtp_connect_timeout=5
+showq unix n - n - - showq
+error unix - - n - - error
+local unix - n n - - local
+virtual unix - n n - - virtual
+lmtp unix - - n - - lmtp
#
# Interfaces to non-Postfix software. Be sure to examine the manual
# pages of the non-Postfix software to find out what options it wants.
@@ -100,12 +101,12 @@
#
# The Cyrus deliver program has changed incompatibly, multiple times.
#
-old-cyrus unix - n n - - pipe
+old-cyrus unix - n n - - pipe
flags=R user=cyrus argv=/cyrus/bin/deliver -e -m ${extension} ${user}
# Cyrus 2.1.5 (Amos Gouaux)
-cyrus unix - n n - - pipe
+cyrus unix - n n - - pipe
user=cyrus argv=/cyrus/bin/deliver -e -r ${sender} -m ${extension} ${user}
-uucp unix - n n - - pipe
+uucp unix - n n - - pipe
flags=Fqhu user=uucp argv=uux -r -n -z -a$sender - $nexthop!rmail ($recipient)
ifmail unix - n n - - pipe
flags=F user=ftn argv=/usr/lib/ifmail/ifmail -r $nexthop ($recipient)
diff -r 609906ecc4e0 -r bfaa89d13ac8 gnu/dist/postfix/conf/post-install
--- a/gnu/dist/postfix/conf/post-install Sat Mar 08 19:12:16 2003 +0000
+++ b/gnu/dist/postfix/conf/post-install Sat Mar 08 19:43:56 2003 +0000
@@ -426,7 +426,6 @@
if [ -n "$create" -a "$type" = "d" -a -n "$create_flag" -a ! -d "$path" ]
then
mkdir $path || exit 1
- $CHATTR $path >/dev/null 2>/dev/null
set_permission=1
# Update all owner/group/mode settings.
elif [ -n "$set_perms" ]
@@ -535,6 +534,15 @@
$POSTCONF -e "$unknown_local = 450" || exit 1
fi
+ # Add missing proxymap service to master.cf.
+
+ grep '^proxymap.*proxymap' $config_directory/master.cf >/dev/null || {
+ echo Editing $config_directory/master.cf, adding missing entry for proxymap service
+ cat >>$config_directory/master.cf <<EOF || exit 1
+proxymap unix - - n - - proxymap
+EOF
+ }
+
}
# A reminder if this is the first time Postfix is being installed.
diff -r 609906ecc4e0 -r bfaa89d13ac8 gnu/dist/postfix/conf/sample-local.cf
--- a/gnu/dist/postfix/conf/sample-local.cf Sat Mar 08 19:12:16 2003 +0000
+++ b/gnu/dist/postfix/conf/sample-local.cf Sat Mar 08 19:43:56 2003 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: sample-local.cf,v 1.2 2002/12/24 21:37:44 perry Exp $
+# $NetBSD: sample-local.cf,v 1.3 2003/03/08 19:43:57 perry Exp $
#
# DO NOT EDIT THIS FILE. EDIT THE MAIN.CF FILE INSTEAD. THE STUFF
# HERE JUST SERVES AS AN EXAMPLE.
@@ -13,6 +13,10 @@
# precedence, from highest to lowest priority: mailbox_transport,
# mailbox_command_maps, mailbox_command, home_mailbox.
+#
+# MISCELLANEOUS PARAMETERS
+#
+
# The biff parameter specifies whether or not to contact the biff
# server. This server sends "new mail" notifications to users who
# have requested new mail notification with "biff y".
diff -r 609906ecc4e0 -r bfaa89d13ac8 gnu/dist/postfix/conf/sample-misc.cf
--- a/gnu/dist/postfix/conf/sample-misc.cf Sat Mar 08 19:12:16 2003 +0000
+++ b/gnu/dist/postfix/conf/sample-misc.cf Sat Mar 08 19:43:56 2003 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: sample-misc.cf,v 1.2 2002/12/24 21:37:44 perry Exp $
+# $NetBSD: sample-misc.cf,v 1.3 2003/03/08 19:43:58 perry Exp $
#
# DO NOT EDIT THIS FILE. EDIT THE MAIN.CF FILE INSTEAD. THE STUFF
# HERE JUST SERVES AS AN EXAMPLE.
@@ -145,8 +145,8 @@
# The ipc_idle parameter bounds the idle time for internal communication
# channels after which a client disconnects voluntarily. The purpose
# is to allow servers to terminate voluntarily after they become
-# idle. Currently this is used by the address resolving and rewriting
-# clients.
+# idle. This is used, for example, by the address resolving and
+# rewriting clients.
#
# Time units: s (seconds), m (minutes), h (hours), d (days), w (weeks).
# The default time unit is s (seconds).
@@ -227,7 +227,7 @@
# a name matches a lookup key. Continue long lines by starting the
# next line with whitespace.
#
-# See sample-local.cf for a description of the local_recipient_maps
+# See sample-smtpd.cf for a description of the local_recipient_maps
# and unknown_local_recipient_reject_code parameters. By default,
# the SMTP server rejects mail for recipients not listed with the
# local_recipient_maps parameter.
diff -r 609906ecc4e0 -r bfaa89d13ac8 gnu/dist/postfix/conf/sample-pcre-body.cf
--- a/gnu/dist/postfix/conf/sample-pcre-body.cf Sat Mar 08 19:12:16 2003 +0000
+++ b/gnu/dist/postfix/conf/sample-pcre-body.cf Sat Mar 08 19:43:56 2003 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: sample-pcre-body.cf,v 1.2 2002/12/24 21:37:45 perry Exp $
+# $NetBSD: sample-pcre-body.cf,v 1.3 2003/03/08 19:43:58 perry Exp $
#
#
# Sample pcre (PERL-compatible regular expression) map file for
@@ -53,7 +53,8 @@
# and after the filter, with header/body
# checks turned off in the second cleanup
# server. More information about content filters
-# is in the Postfix FILTER_README file.
+# is in the Postfix FILTER_README file. This feature
+# overrides the main.cf content_filter setting.
#
# Substitution of sub-strings from the matched expression is
# possible using the conventional perl syntax. The macros in the
diff -r 609906ecc4e0 -r bfaa89d13ac8 gnu/dist/postfix/conf/sample-pcre-header.cf
--- a/gnu/dist/postfix/conf/sample-pcre-header.cf Sat Mar 08 19:12:16 2003 +0000
+++ b/gnu/dist/postfix/conf/sample-pcre-header.cf Sat Mar 08 19:43:56 2003 +0000
@@ -1,12 +1,12 @@
-# $NetBSD: sample-pcre-header.cf,v 1.2 2002/12/24 21:37:45 perry Exp $
+# $NetBSD: sample-pcre-header.cf,v 1.3 2003/03/08 19:43:58 perry Exp $
#
#
# Sample pcre (PERL-compatible regular expression) map file for
# message header filtering. See pcre_table(5) for syntax description.
#
# Message headers are filtered one at a time. This filter understands
-# multi-line message headers. However, the message header filter has
-# no knowledge of MIME headers that are embedded in the message body.
+# multi-line message headers, including MIME headers in the message
+# body.
#
# The first field is a perl-like regular expression. The expression
# delimiter can be any character except whitespace, or characters
@@ -54,7 +54,8 @@
# and after the filter, with header/body
# checks turned off in the second cleanup
# server. More information about content filters
-# is in the Postfix FILTER_README file.
+# is in the Postfix FILTER_README file. This feature
+# overrides the main.cf content_filter setting.
#
# Substitution of sub-strings from the matched expression is
# possible using the conventional perl syntax. The macros in the
diff -r 609906ecc4e0 -r bfaa89d13ac8 gnu/dist/postfix/conf/sample-regexp-body.cf
--- a/gnu/dist/postfix/conf/sample-regexp-body.cf Sat Mar 08 19:12:16 2003 +0000
+++ b/gnu/dist/postfix/conf/sample-regexp-body.cf Sat Mar 08 19:43:56 2003 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: sample-regexp-body.cf,v 1.2 2002/12/24 21:37:45 perry Exp $
+# $NetBSD: sample-regexp-body.cf,v 1.3 2003/03/08 19:43:58 perry Exp $
#
# Sample regexp message body filter lookup "table". See regexp_table(5)
# for a description of the syntax.
@@ -45,7 +45,8 @@
# After the message is queued, send the entire message through
# a content filter. This requires different cleanup servers
# before and after the filter, with header/body checks turned
-# off in the second cleanup server.
+# off in the second cleanup server. This overrides the main.cf
+# content filter setting.
# Skip over base 64 encoded blocks. This saves lots of CPU cycles.
# Expressions by Liviu Daia. Amended by Victor Duchovni.
diff -r 609906ecc4e0 -r bfaa89d13ac8 gnu/dist/postfix/conf/sample-regexp-header.cf
--- a/gnu/dist/postfix/conf/sample-regexp-header.cf Sat Mar 08 19:12:16 2003 +0000
+++ b/gnu/dist/postfix/conf/sample-regexp-header.cf Sat Mar 08 19:43:56 2003 +0000
@@ -1,11 +1,10 @@
-# $NetBSD: sample-regexp-header.cf,v 1.2 2002/12/24 21:37:45 perry Exp $
+# $NetBSD: sample-regexp-header.cf,v 1.3 2003/03/08 19:43:58 perry Exp $
#
# Sample regexp message header filter lookup "table". See regexp_table(5)
# for a description of the syntax.
#
# Message headers are filtered one at a time. This filter understands
-# multi-line mail headers. However, the message header filter has no
-# knowledge of MIME headers that are embedded in the message body.
+# multi-line mail headers, including MIME headers in the message body.
#
# The general format of a table entry is PATTERN RESULT.
#
@@ -46,7 +45,8 @@
# After the message is queued, send the entire message through
# a content filter. This requires different cleanup servers
# before and after the filter, with header/body checks turned
-# off in the second cleanup server.
+# off in the second cleanup server. This overrides the main.cf
+# content filter setting.
/^Subject: Make Money Fast/ REJECT
/^To: friend%public.com@localhost/ REJECT
diff -r 609906ecc4e0 -r bfaa89d13ac8 gnu/dist/postfix/conf/sample-smtpd.cf
Home |
Main Index |
Thread Index |
Old Index