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/1b0095e0741d
branches: trunk
changeset: 540805:1b0095e0741d
user: perry <perry%NetBSD.org@localhost>
date: Tue Dec 24 20:38:22 2002 +0000
description:
resolve conflicts
diffstat:
gnu/dist/postfix/makedefs | 12 +-
gnu/dist/postfix/man/man5/virtual.5 | 184 +-
gnu/dist/postfix/man/man8/local.8 | 39 +-
gnu/dist/postfix/src/dns/dns_lookup.c | 48 +-
gnu/dist/postfix/src/master/master_ent.c | 2 +
gnu/dist/postfix/src/qmgr/qmgr_message.c | 179 +-
gnu/dist/postfix/src/smtp/smtp_addr.c | 13 +
gnu/dist/postfix/src/smtp/smtp_connect.c | 57 +-
gnu/dist/postfix/src/smtpd/smtpd.c | 248 +++-
gnu/dist/postfix/src/smtpd/smtpd_check.c | 1454 ++++++++++++++++++++++-----
gnu/dist/postfix/src/smtpd/smtpd_peer.c | 10 +
gnu/dist/postfix/src/util/Makefile.in | 99 +-
gnu/dist/postfix/src/util/sys_defs.h | 173 ++-
gnu/dist/postfix/src/util/valid_hostname.c | 55 +-
14 files changed, 1869 insertions(+), 704 deletions(-)
diffs (truncated from 4571 to 300 lines):
diff -r cac65dd7c2c7 -r 1b0095e0741d gnu/dist/postfix/makedefs
--- a/gnu/dist/postfix/makedefs Tue Dec 24 20:26:59 2002 +0000
+++ b/gnu/dist/postfix/makedefs Tue Dec 24 20:38:22 2002 +0000
@@ -170,6 +170,10 @@
;;
*) echo "Unknown AIX version: `uname -v`." 1>&2; exit 1;;
esac;;
+ # Tested with RedHat 3.03 on 20020729.
+ Linux.1*) SYSTYPE=LINUX1
+ SYSLIBS="-ldb"
+ ;;
Linux.2*) SYSTYPE=LINUX2
# Postfix no longer needs DB 1.85 compatibility
if [ -f /usr/include/db.h ]
@@ -187,6 +191,10 @@
echo "See the RELEASE_NOTES file for more information." 1>&2
exit 1
fi
+ if [ -f /usr/include/pcre/pcre.h ]
+ then
+ CCARGS="$CCARGS -DHAS_PCRE -I/usr/include/pcre"
+ fi
# GDBM locks the DBM .pag file after open. This breaks postmap.
# if [ -f /usr/include/gdbm-ndbm.h ]
# then
@@ -198,7 +206,7 @@
# GDBM_LIBS=gdbm
# fi
SYSLIBS="-ldb"
- for name in nsl resolv $GDBM_LIBS
+ for name in nsl resolv pcre $GDBM_LIBS
do
test -e /usr/lib/lib$name.a -o -e /usr/lib/lib$name.so \
-o -e /lib/lib$name.a -o -e /lib/lib$name.so \
@@ -309,5 +317,5 @@
DEBUG = $DEBUG
AWK = $AWK
STRCASE = $STRCASE
-EXPORT = AUXLIBS="$AUXLIBS" CCARGS="$CCARGS" OPT="$OPT" DEBUG="$DEBUG"
+EXPORT = AUXLIBS='$AUXLIBS' CCARGS='$CCARGS' OPT='$OPT' DEBUG='$DEBUG'
EOF
diff -r cac65dd7c2c7 -r 1b0095e0741d gnu/dist/postfix/man/man5/virtual.5
--- a/gnu/dist/postfix/man/man5/virtual.5 Tue Dec 24 20:26:59 2002 +0000
+++ b/gnu/dist/postfix/man/man5/virtual.5 Tue Dec 24 20:38:22 2002 +0000
@@ -4,25 +4,41 @@
.SH NAME
virtual
\-
-format of Postfix virtual table
+format of Postfix virtual alias table
.SH SYNOPSIS
.na
.nf
\fBpostmap /etc/postfix/virtual\fR
+
+\fBpostmap -q "\fIstring\fB" /etc/postfix/virtual\fR
+
+\fBpostmap -q - /etc/postfix/virtual <\fIinputfile\fR
.SH DESCRIPTION
.ad
.fi
-The optional \fBvirtual\fR table specifies address redirections for
-local and non-local recipients or domains. The redirections are used
-by the \fBcleanup\fR(8) daemon. The redirections are recursive.
+The optional \fBvirtual\fR alias table specifies address aliasing
+for arbitrary local or non-local recipient addresses. Virtual aliasing
+is recursive, and is done by the Postfix \fBcleanup\fR(8) daemon.
-The \fBvirtual\fR redirection is applied only to recipient
+The main applications of virtual aliasing are:
+.IP \(bu
+To redirect mail for one address to one or more addresses.
+.IP \(bu
+To implement virtual alias domains where all addresses are aliased
+to addresses in other domains.
+.sp
+Virtual alias domains are not to be confused with the virtual mailbox
+domains that are implemented with the Postfix \fBvirtual\fR(8) mail
+delivery agent. With virtual mailbox domains, each recipient address
+can have its own mailbox.
+.PP
+Virtual aliasing is applied only to recipient
envelope addresses, and does not affect message headers.
Think Sendmail rule set \fBS0\fR, if you like. Use \fBcanonical\fR(5)
mapping to rewrite header and envelope addresses in general.
-Normally, the \fBvirtual\fR table is specified as a text file that
-serves as input to the \fBpostmap\fR(1) command.
+Normally, the \fBvirtual\fR alias table is specified as a text file
+that serves as input to the \fBpostmap\fR(1) command.
The result, an indexed file in \fBdbm\fR or \fBdb\fR format,
is used for fast searching by the mail system. Execute the command
\fBpostmap /etc/postfix/virtual\fR in order to rebuild the indexed
@@ -34,87 +50,6 @@
Alternatively, the table can be provided as a regular-expression
map where patterns are given as regular expressions. In that case,
the lookups are done in a slightly different way as described below.
-.SH POSTFIX-STYLE VIRTUAL DOMAINS
-.na
-.nf
-.ad
-.fi
-With a Postfix-style virtual domain, the virtual domain has its
-own user name space. Local (i.e. non-virtual) usernames are not
-visible in a Postfix-style virtual domain. In particular, local
-\fBaliases\fR(5) and mailing lists are not visible as
-\fIlocalname@virtual.domain\fR.
-
-Use a Sendmail-style virtual domain (see below) if local usernames,
-\fBaliases\fR(5) or mailing lists should be visible as
-\fIlocalname@virtual.domain\fR.
-
-Support for a Postfix-style virtual domain looks like:
-.sp
-/etc/postfix/virtual:
-.in +4
-.nf
-\fIvirtual.domain anything\fR (right-hand content does not matter)
-\fIpostmaster@virtual.domain postmaster\fR
-\fIuser1@virtual.domain address1\fR
-\fIuser2@virtual.domain address2, address3\fR
-.fi
-.in -4
-
-The \fIvirtual.domain anything\fR entry is required for a
-Postfix-style virtual domain.
-
-Do not list a Postfix-style virtual domain in the \fBmain.cf
-mydestination\fR configuration parameter.
-Such an entry is required only for a Sendmail-style virtual domain.
-
-With a Postfix-style virtual domain, the Postfix SMTP server
-accepts mail for \fIknown-user@virtual.domain\fR and rejects
-mail for \fIunknown-user\fR@\fIvirtual.domain\fR as undeliverable.
-.SH SENDMAIL-STYLE VIRTUAL DOMAINS
-.na
-.nf
-.ad
-.fi
-With a Sendmail-style virtual domain, every local (i.e. non-virtual)
-username is visible in the virtual domain. In particular, every local
-alias and mailing list is visible as \fIlocalname@virtual.domain\fR.
-
-Use a Postfix-style virtual domain (see above) if local usernames,
-\fBaliases\fR(5) or mailing lists should not be visible as
-\fIlocalname@virtual.domain\fR.
-
-Support for a Sendmail-style virtual domain looks like:
-.sp
-/etc/postfix/main.cf:
-.in +4
-.nf
-mydestination = $myhostname localhost.$mydomain $mydomain
-.ti +4
-\fIvirtual.domain\fR
-.fi
-.in -4
-.sp
-/etc/postfix/virtual:
-.in +4
-.nf
-\fIuser1@virtual.domain address1\fR
-\fIuser2@virtual.domain address2, address3\fR
-.fi
-.in -4
-
-The \fBmain.cf mydestination\fR entry is required for a Sendmail-style
-virtual domain.
-
-Do not specify a \fIvirtual.domain anything\fR virtual map entry
-for a Sendmail-style virtual domain.
-Such an entry is required only with a Postfix-style virtual domain.
-
-With a Sendmail-style virtual domain, the Postfix local delivery
-agent delivers mail for an unknown \fIuser\fR@\fIvirtual.domain\fR
-to a local (i.e. non-virtual) user that has the same name; if no
-such recipient exists, the Postfix local delivery agent bounces the
-mail to the sender.
.SH TABLE FORMAT
.na
.nf
@@ -163,6 +98,65 @@
\fIuser+foo\fR@\fIdomain\fR, \fIuser\fR@\fIdomain\fR, \fIuser+foo\fR,
\fIuser\fR, and @\fIdomain\fR. An unmatched address extension
(\fI+foo\fR) is propagated to the result of table lookup.
+.SH VIRTUAL ALIAS DOMAINS
+.na
+.nf
+.ad
+.fi
+Besides virtual aliases, the virtual alias table can also be used
+to implement virtual alias domains. With a virtual alias domain, all
+recipient addresses are aliased to addresses in other domains.
+
+Virtual alias domains are not to be confused with the virtual mailbox
+domains that are implemented with the Postfix \fBvirtual\fR(8) mail
+delivery agent. With virtual mailbox domains, each recipient address
+can have its own mailbox.
+
+With a virtual alias domain, the virtual domain has its
+own user name space. Local (i.e. non-virtual) usernames are not
+visible in a virtual alias domain. In particular, local
+\fBaliases\fR(5) and local mailing lists are not visible as
+\fIlocalname@virtual-alias.domain\fR.
+
+Support for a virtual alias domain looks like:
+
+/etc/postfix/main.cf:
+.in +4
+virtual_alias_maps = hash:/etc/postfix/virtual
+
+Note: some systems use \fBdbm\fR databases instead of \fBhash\fR.
+See the output from \fBpostconf -m\fR for available database types.
+
+.ti -4
+/etc/postfix/virtual:
+.nf
+.na
+\fIvirtual-alias.domain anything\fR (right-hand content does not matter)
+\fIpostmaster@virtual-alias.domain postmaster\fR
+\fIuser1@virtual-alias.domain address1\fR
+\fIuser2@virtual-alias.domain address2, address3\fR
+.fi
+.in -4
+.ad
+.fi
+.sp
+The \fIvirtual-alias.domain anything\fR entry is required for a
+virtual alias domain. Without this entry, mail is rejected
+with "relay access denied", or bounces with
+"mail loops back to myself".
+
+Do not specify virtual alias domain names in the \fBmain.cf
+mydestination\fR or \fBrelay_domains\fR configuration parameters.
+
+With a virtual alias domain, the Postfix SMTP server
+accepts mail for \fIknown-user@virtual-alias.domain\fR, and rejects
+mail for \fIunknown-user\fR@\fIvirtual-alias.domain\fR as undeliverable.
+
+Instead of specifying the virtual alias domain name via
+the \fBvirtual_alias_maps\fR table, you may also specify it via
+the \fBmain.cf virtual_alias_domains\fR configuration parameter.
+This latter parameter uses the same syntax as the \fBmain.cf
+mydestination\fR configuration parameter.
.SH REGULAR EXPRESSION TABLES
.na
.nf
@@ -197,16 +191,20 @@
this topic. See the Postfix \fBmain.cf\fR file for syntax details
and for default values. Use the \fBpostfix reload\fR command after
a configuration change.
-.IP \fBvirtual_maps\fR
-List of virtual mapping tables.
+.IP \fBvirtual_alias_maps\fR
+List of virtual aliasing tables.
+.IP \fBvirtual_alias_domains\fR
+List of virtual alias domains. This uses the same syntax
+as the \fBmydestination\fR parameter.
.PP
Other parameters of interest:
.IP \fBinet_interfaces\fR
The network interface addresses that this system receives mail on.
+You need to stop and start Postfix when this parameter changes.
.IP \fBmydestination\fR
List of domains that this mail system considers local.
.IP \fBmyorigin\fR
-The domain that is appended to locally-posted mail.
+The domain that is appended to any address that does not have a domain.
.IP \fBowner_request_special\fR
Give special treatment to \fBowner-\fIxxx\fR and \fIxxx\fB-request\fR
addresses.
@@ -215,8 +213,8 @@
.nf
cleanup(8) canonicalize and enqueue mail
postmap(1) create mapping table
-pcre_table(5) format of PCRE tables
-regexp_table(5) format of POSIX regular expression tables
+regexp_table(5) POSIX regular expression table format
+pcre_table(5) Perl Compatible Regular Expression table format
.SH LICENSE
.na
.nf
diff -r cac65dd7c2c7 -r 1b0095e0741d gnu/dist/postfix/man/man8/local.8
--- a/gnu/dist/postfix/man/man8/local.8 Tue Dec 24 20:26:59 2002 +0000
+++ b/gnu/dist/postfix/man/man8/local.8 Tue Dec 24 20:38:22 2002 +0000
@@ -121,6 +121,8 @@
In the case of UNIX-style mailbox delivery,
the \fBlocal\fR daemon prepends a "\fBFrom \fIsender time_stamp\fR"
envelope header to each message, prepends an
+\fBX-Original-To:\fR header with the recipient address as given to
+Postfix, prepends an
optional \fBDelivered-To:\fR header
with the envelope recipient address, prepends a \fBReturn-Path:\fR
header with the envelope sender address, prepends a \fB>\fR character
@@ -131,7 +133,10 @@
In the case of \fBmaildir\fR delivery, the local daemon prepends
an optional
-\fBDelivered-To:\fR header with the envelope recipient address
+\fBDelivered-To:\fR header with the final envelope recipient address,
Home |
Main Index |
Thread Index |
Old Index