+ +
+ +
@@ -352,8 +355,10 @@ subnetworks that Postfix is connected to.
-To specify the list of trusted networks by hand, specify -network blocks in CIDR (network/mask) notation, for example: +Alternatively, you can specify the mynetworks list by hand, +in which case Postfix ignores the mynetworks_style setting. +To specify the list of trusted networks by hand, specify network +blocks in CIDR (network/mask) notation, for example:
@@ -363,6 +368,11 @@ network blocks in CIDR (network/mask) notation, for example:
+
+You can also specify the absolute pathname of a pattern file instead
+of listing the patterns in the main.cf file.
+
My own network addresses
The inet_interfaces parameter specifies all network interface
diff --git a/postfix/html/faq.html b/postfix/html/faq.html
index 0e39f9d05..d48c5be2f 100644
--- a/postfix/html/faq.html
+++ b/postfix/html/faq.html
@@ -22,10 +22,12 @@
+
+
-
-
+
+Examples of software that is used successfully with Postfix:
+
+
+
+
+
+
+
+
+
+
+
+Unfortunately, some Linux systems have a helpful utility called
+linuxconf that automatically "fixes" file permissions to
+what they are supposed to be for Sendmail's sendmail command.
+Even when you reset the set-uid bit on the Postfix sendmail
+executable file, linuxconf will happily turn it on again
+for you.
+
+
+
+On SuSE systems the file permission fixing utulity is called
+SuSEconfig. Other Linux systems may use different names.
+The usual disclaimers about mileages etc. apply.
+
+
+
+
@@ -2647,8 +2751,8 @@ the same queue file name.
-If you have to delete a large amount of mail, it is safer to stop
-Postfix first.
+If you have to delete a large amount of mail, you must stop Postfix
+first.
Postfix warnings and error messages
+
+
+
+
+
+Example configurations
@@ -78,24 +100,6 @@
Postfix warnings and error messages
-
-
-
-
-
-Sendmail incompatibility
@@ -309,6 +313,44 @@ mailbox
+POP or IMAP problems
+
+Postfix is a mail delivery system. Postfix does not implement
+services such as POP or IMAP to read mail. Several POP/IMAP
+implementations exist that can cooperate with software such as
+Postfix.
+
+
+
+
+
+
+
Stand-alone machine
Out of the box, Postfix should work without change on a stand-alone
@@ -866,6 +908,68 @@ following command as root:
+sendmail has set-uid root file permissions, or is run from a
+set-uid root process
+
+Traditionally, the UNIX sendmail command is installed with
+set-uid root permissions. Even many MTAs other than Sendmail ship
+with a set-uid root sendmail command. This is not the case
+with Postfix. The Postfix sendmail command is designed not
+to be set-uid.
+
+Solutions
+
+
+
+
+
+
+
+
+
+# /etc/rc.d/init.d/linuxconf stop && rpm --erase linuxconf
+
+
+
+
+and to make sure that in /etc/rc.config,
+PERMISSIONS_SECURITY mentions local last, EXAMPLE:
+
+
+/usr/sbin/sendmail root.root 755
+
+
+
+
+
+CHECK_PERMISSIONS=set
+PERMISSION_SECURITY="secure local"
+
+
+
Running hundreds of Postfix processes on FreeBSD
With hundreds of Postfix processes, the kernel will eventually
@@ -2629,8 +2733,8 @@ Note: be sure to not advertise fax.your.domain in the DNS :-)
Deleting a message from the Postfix queue
-To delete ONE message with queue id ABCDEF from the Postfix queue,
-it is not necessary to stop Postfix.
+To delete ONE message with queue id ABCDEF (e.g., from mailq
+output) from the Postfix queue, it is not necessary to stop Postfix.
diff --git a/postfix/html/local.8.html b/postfix/html/local.8.html
index 04aa4eb83..e909eaa28 100644
--- a/postfix/html/local.8.html
+++ b/postfix/html/local.8.html
@@ -360,9 +360,10 @@ LOCAL(8) LOCAL(8)
recipient_delimiter
Separator between username and address extension.
- test_home_directory
+ require_home_directory
Require that a recipient's home directory is acces-
sible by the recipient before attempting delivery.
+ Defer delivery otherwise.
Mailbox delivery
fallback_transport
@@ -388,7 +389,6 @@ LOCAL(8) LOCAL(8)
External command to use for mailbox delivery. The
command executes with the recipient privileges
(exception: root). The string is subject to $name
- expansions.
@@ -401,6 +401,8 @@ LOCAL(8) LOCAL(8)
LOCAL(8) LOCAL(8)
+ expansions.
+
mailbox_transport
Message transport to use for mailbox delivery to
all local recipients, whether or not they are found
@@ -420,7 +422,7 @@ LOCAL(8) LOCAL(8)
stale_lock_time
Limit the time after which a stale lock is removed.
- mailbox__delivery_lock
+ mailbox_delivery_lock
What file locking method(s) to use when delivering
to a UNIX-style mailbox. The default setting is
system dependent. For a list of available file
@@ -456,8 +458,6 @@ LOCAL(8) LOCAL(8)
-
-
7
diff --git a/postfix/man/man8/local.8 b/postfix/man/man8/local.8
index db1f94677..c0929a6ac 100644
--- a/postfix/man/man8/local.8
+++ b/postfix/man/man8/local.8
@@ -312,9 +312,9 @@ forwarding, delivery to command or file. Specify zero or more of:
forwarding mail is not recommended.
.IP \fBrecipient_delimiter\fR
Separator between username and address extension.
-.IP \fBtest_home_directory\fR
+.IP \fBrequire_home_directory\fR
Require that a recipient's home directory is accessible by the
-recipient before attempting delivery.
+recipient before attempting delivery. Defer delivery otherwise.
.SH Mailbox delivery
.ad
.fi
@@ -351,7 +351,7 @@ Time in seconds between successive attempts to acquire
an exclusive lock.
.IP \fBstale_lock_time\fR
Limit the time after which a stale lock is removed.
-.IP \fBmailbox__delivery_lock\fR
+.IP \fBmailbox_delivery_lock\fR
What file locking method(s) to use when delivering to a UNIX-style
mailbox.
The default setting is system dependent. For a list of available
diff --git a/postfix/src/global/mail_version.h b/postfix/src/global/mail_version.h
index d1dadc6b3..f0445eecd 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-20010225"
+#define DEF_MAIL_VERSION "Snapshot-20010228"
extern char *var_mail_version;
/* LICENSE
diff --git a/postfix/src/local/local.c b/postfix/src/local/local.c
index 1118acd18..931b2c98f 100644
--- a/postfix/src/local/local.c
+++ b/postfix/src/local/local.c
@@ -284,9 +284,9 @@
/* forwarding mail is not recommended.
/* .IP \fBrecipient_delimiter\fR
/* Separator between username and address extension.
-/* .IP \fBtest_home_directory\fR
+/* .IP \fBrequire_home_directory\fR
/* Require that a recipient's home directory is accessible by the
-/* recipient before attempting delivery.
+/* recipient before attempting delivery. Defer delivery otherwise.
/* .SH Mailbox delivery
/* .ad
/* .fi
@@ -323,7 +323,7 @@
/* an exclusive lock.
/* .IP \fBstale_lock_time\fR
/* Limit the time after which a stale lock is removed.
-/* .IP \fBmailbox__delivery_lock\fR
+/* .IP \fBmailbox_delivery_lock\fR
/* What file locking method(s) to use when delivering to a UNIX-style
/* mailbox.
/* The default setting is system dependent. For a list of available
diff --git a/postfix/src/master/master_sig.c b/postfix/src/master/master_sig.c
index a113b13c6..ca501e918 100644
--- a/postfix/src/master/master_sig.c
+++ b/postfix/src/master/master_sig.c
@@ -214,6 +214,8 @@ void master_sigsetup(void)
msg_fatal("pipe: %m");
non_blocking(SIG_PIPE_WRITE_FD, NON_BLOCKING);
non_blocking(SIG_PIPE_READ_FD, NON_BLOCKING);
+ close_on_exec(SIG_PIPE_WRITE_FD, CLOSE_ON_EXEC);
+ close_on_exec(SIG_PIPE_READ_FD, CLOSE_ON_EXEC);
event_enable_read(SIG_PIPE_READ_FD, master_sig_event, (char *) 0);
#endif
diff --git a/postfix/src/nqmgr/qmgr_message.c b/postfix/src/nqmgr/qmgr_message.c
index ad19aebae..5d56eba03 100644
--- a/postfix/src/nqmgr/qmgr_message.c
+++ b/postfix/src/nqmgr/qmgr_message.c
@@ -685,8 +685,16 @@ static void qmgr_message_resolve(QMGR_MESSAGE *message)
at = strrchr(STR(reply.recipient), '@');
len = (at ? (at - STR(reply.recipient)) : strlen(STR(reply.recipient)));
- if ((transport = qmgr_transport_find(STR(reply.transport))) == 0)
- transport = qmgr_transport_create(STR(reply.transport));
+ /*
+ * Look up or instantiate the proper transport. We're working a
+ * little ahead, doing queue management stuff that used to be done
+ * way down.
+ */
+ if (transport == 0 || !STREQ(transport->name, STR(reply.transport))) {
+ if ((transport = qmgr_transport_find(STR(reply.transport))) == 0)
+ transport = qmgr_transport_create(STR(reply.transport));
+ queue = 0;
+ }
if (transport->recipient_limit == 1) {
VSTRING_SPACE(reply.nexthop, len + 1);
memmove(STR(reply.nexthop) + len + 1, STR(reply.nexthop),
@@ -740,6 +748,7 @@ static void qmgr_message_resolve(QMGR_MESSAGE *message)
* bind each recipient to an in-core queue instance which is needed
* anyway. That gives all information needed for recipient grouping.
*/
+#if 0
/*
* Look up or instantiate the proper transport.
@@ -749,6 +758,7 @@ static void qmgr_message_resolve(QMGR_MESSAGE *message)
transport = qmgr_transport_create(STR(reply.transport));
queue = 0;
}
+#endif
/*
* This transport is dead. Defer delivery to this recipient.
diff --git a/postfix/src/qmgr/qmgr_message.c b/postfix/src/qmgr/qmgr_message.c
index 7ec5521d9..e696fb4a7 100644
--- a/postfix/src/qmgr/qmgr_message.c
+++ b/postfix/src/qmgr/qmgr_message.c
@@ -565,8 +565,16 @@ static void qmgr_message_resolve(QMGR_MESSAGE *message)
at = strrchr(STR(reply.recipient), '@');
len = (at ? (at - STR(reply.recipient)) : strlen(STR(reply.recipient)));
- if ((transport = qmgr_transport_find(STR(reply.transport))) == 0)
- transport = qmgr_transport_create(STR(reply.transport));
+ /*
+ * Look up or instantiate the proper transport. We're working a
+ * little ahead, doing queue management stuff that used to be done
+ * way down.
+ */
+ if (transport == 0 || !STREQ(transport->name, STR(reply.transport))) {
+ if ((transport = qmgr_transport_find(STR(reply.transport))) == 0)
+ transport = qmgr_transport_create(STR(reply.transport));
+ queue = 0;
+ }
if (transport->recipient_limit == 1) {
VSTRING_SPACE(reply.nexthop, len + 1);
memmove(STR(reply.nexthop) + len + 1, STR(reply.nexthop),
@@ -620,6 +628,7 @@ static void qmgr_message_resolve(QMGR_MESSAGE *message)
* bind each recipient to an in-core queue instance which is needed
* anyway. That gives all information needed for recipient grouping.
*/
+#if 0
/*
* Look up or instantiate the proper transport.
@@ -629,6 +638,7 @@ static void qmgr_message_resolve(QMGR_MESSAGE *message)
transport = qmgr_transport_create(STR(reply.transport));
queue = 0;
}
+#endif
/*
* This transport is dead. Defer delivery to this recipient.