From: Wietse Venema Date: Sun, 14 Jan 2018 05:00:00 +0000 (-0500) Subject: postfix-3.3-20180114 X-Git-Tag: v3.3.0-RC1~2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d19cd2c4232222666269876e166665fecca84677;p=thirdparty%2Fpostfix.git postfix-3.3-20180114 --- diff --git a/postfix/HISTORY b/postfix/HISTORY index e3b046f58..23cb174f5 100644 --- a/postfix/HISTORY +++ b/postfix/HISTORY @@ -23285,4 +23285,15 @@ Apologies for any names omitted. proto/postconf.proto global/mail_params.h, global/mail_params.c, master/single_server.c, master/multi_server.c, master/trigger_server.c, master/event_server.c, - postconf/postconf_master.c, postconf/postconf_builtin.c. + postconf/postconf_master.c, postconf/postconf_builtin.c, + and daemon manpages. + +20180114 + + Paranoia: censor the postqueue process name, similar to the + set-gid postdrop program. File: postqueue/postqueue.c. + + Cleanup: the new "service_name" parameter is applicable + only to Postfix daemons configured in master.cf; hyperlink + the parameter name in documentation. Files: proto/postconf.proto, + mantools/postlink, daemon manpages. diff --git a/postfix/html/anvil.8.html b/postfix/html/anvil.8.html index 9ee797b57..d7092449d 100644 --- a/postfix/html/anvil.8.html +++ b/postfix/html/anvil.8.html @@ -210,9 +210,8 @@ ANVIL(8) ANVIL(8) Available in Postfix 3.3 and later: - service_name (read-only) - The master.cf service name of a Postfix daemon process, or the - process name of a non-daemon process. + service_name (read-only) + The master.cf service name of a Postfix daemon process. SEE ALSO smtpd(8), Postfix SMTP server diff --git a/postfix/html/bounce.8.html b/postfix/html/bounce.8.html index 3c8da1e53..9f6a7a8b4 100644 --- a/postfix/html/bounce.8.html +++ b/postfix/html/bounce.8.html @@ -150,9 +150,8 @@ BOUNCE(8) BOUNCE(8) Available in Postfix 3.3 and later: - service_name (read-only) - The master.cf service name of a Postfix daemon process, or the - process name of a non-daemon process. + service_name (read-only) + The master.cf service name of a Postfix daemon process. FILES /var/spool/postfix/bounce/* non-delivery records diff --git a/postfix/html/cleanup.8.html b/postfix/html/cleanup.8.html index 544aac00c..8d766b26e 100644 --- a/postfix/html/cleanup.8.html +++ b/postfix/html/cleanup.8.html @@ -486,9 +486,8 @@ CLEANUP(8) CLEANUP(8) Available in Postfix 3.3 and later: - service_name (read-only) - The master.cf service name of a Postfix daemon process, or the - process name of a non-daemon process. + service_name (read-only) + The master.cf service name of a Postfix daemon process. FILES /etc/postfix/canonical*, canonical mapping table diff --git a/postfix/html/defer.8.html b/postfix/html/defer.8.html index 3c8da1e53..9f6a7a8b4 100644 --- a/postfix/html/defer.8.html +++ b/postfix/html/defer.8.html @@ -150,9 +150,8 @@ BOUNCE(8) BOUNCE(8) Available in Postfix 3.3 and later: - service_name (read-only) - The master.cf service name of a Postfix daemon process, or the - process name of a non-daemon process. + service_name (read-only) + The master.cf service name of a Postfix daemon process. FILES /var/spool/postfix/bounce/* non-delivery records diff --git a/postfix/html/discard.8.html b/postfix/html/discard.8.html index ff9a16be6..340ca46c7 100644 --- a/postfix/html/discard.8.html +++ b/postfix/html/discard.8.html @@ -95,9 +95,8 @@ DISCARD(8) DISCARD(8) Available in Postfix 3.3 and later: - service_name (read-only) - The master.cf service name of a Postfix daemon process, or the - process name of a non-daemon process. + service_name (read-only) + The master.cf service name of a Postfix daemon process. SEE ALSO qmgr(8), queue manager diff --git a/postfix/html/dnsblog.8.html b/postfix/html/dnsblog.8.html index cbd1064da..dbc155f47 100644 --- a/postfix/html/dnsblog.8.html +++ b/postfix/html/dnsblog.8.html @@ -73,9 +73,8 @@ DNSBLOG(8) DNSBLOG(8) Available in Postfix 3.3 and later: - service_name (read-only) - The master.cf service name of a Postfix daemon process, or the - process name of a non-daemon process. + service_name (read-only) + The master.cf service name of a Postfix daemon process. SEE ALSO smtpd(8), Postfix SMTP server diff --git a/postfix/html/error.8.html b/postfix/html/error.8.html index 9a2243fa0..233246cb8 100644 --- a/postfix/html/error.8.html +++ b/postfix/html/error.8.html @@ -108,9 +108,8 @@ ERROR(8) ERROR(8) Available in Postfix 3.3 and later: - service_name (read-only) - The master.cf service name of a Postfix daemon process, or the - process name of a non-daemon process. + service_name (read-only) + The master.cf service name of a Postfix daemon process. SEE ALSO qmgr(8), queue manager diff --git a/postfix/html/flush.8.html b/postfix/html/flush.8.html index 7a5a26bec..cd9fe43e2 100644 --- a/postfix/html/flush.8.html +++ b/postfix/html/flush.8.html @@ -140,9 +140,8 @@ FLUSH(8) FLUSH(8) Available in Postfix 3.3 and later: - service_name (read-only) - The master.cf service name of a Postfix daemon process, or the - process name of a non-daemon process. + service_name (read-only) + The master.cf service name of a Postfix daemon process. FILES /var/spool/postfix/flush, "fast flush" logfiles. diff --git a/postfix/html/lmtp.8.html b/postfix/html/lmtp.8.html index 68ab8d2b5..e5e0259c7 100644 --- a/postfix/html/lmtp.8.html +++ b/postfix/html/lmtp.8.html @@ -881,9 +881,8 @@ SMTP(8) SMTP(8) Available in Postfix 3.3 and later: - service_name (read-only) - The master.cf service name of a Postfix daemon process, or the - process name of a non-daemon process. + service_name (read-only) + The master.cf service name of a Postfix daemon process. SEE ALSO generic(5), output address rewriting diff --git a/postfix/html/local.8.html b/postfix/html/local.8.html index d7be72e33..973514e72 100644 --- a/postfix/html/local.8.html +++ b/postfix/html/local.8.html @@ -572,9 +572,8 @@ LOCAL(8) LOCAL(8) address is rewritten to a different address (for example with aliasing or with canonical mapping). - service_name (read-only) - The master.cf service name of a Postfix daemon process, or the - process name of a non-daemon process. + service_name (read-only) + The master.cf service name of a Postfix daemon process. FILES The following are examples; details differ between systems. @@ -596,10 +595,10 @@ LOCAL(8) LOCAL(8) The Secure Mailer license must be distributed with this software. HISTORY - The Delivered-To: message header appears in the qmail system by Daniel + The Delivered-To: message header appears in the qmail system by Daniel Bernstein. - The maildir structure appears in the qmail system by Daniel Bernstein. + The maildir structure appears in the qmail system by Daniel Bernstein. AUTHOR(S) Wietse Venema diff --git a/postfix/html/master.8.html b/postfix/html/master.8.html index 47bf1e01d..4a064c784 100644 --- a/postfix/html/master.8.html +++ b/postfix/html/master.8.html @@ -169,12 +169,11 @@ MASTER(8) MASTER(8) Available in Postfix 3.3 and later: - service_name (read-only) - The master.cf service name of a Postfix daemon process, or the - process name of a non-daemon process. + service_name (read-only) + The master.cf service name of a Postfix daemon process. FILES - To expand the directory names below into their actual values, use the + To expand the directory names below into their actual values, use the command "postconf config_directory" etc. $config_directory/main.cf, global configuration file. diff --git a/postfix/html/oqmgr.8.html b/postfix/html/oqmgr.8.html index b0ef89c97..cb98749f3 100644 --- a/postfix/html/oqmgr.8.html +++ b/postfix/html/oqmgr.8.html @@ -378,9 +378,8 @@ OQMGR(8) OQMGR(8) Available in Postfix 3.3 and later: - service_name (read-only) - The master.cf service name of a Postfix daemon process, or the - process name of a non-daemon process. + service_name (read-only) + The master.cf service name of a Postfix daemon process. FILES /var/spool/postfix/incoming, incoming queue diff --git a/postfix/html/pickup.8.html b/postfix/html/pickup.8.html index cbb8cc68c..7173796e8 100644 --- a/postfix/html/pickup.8.html +++ b/postfix/html/pickup.8.html @@ -94,9 +94,8 @@ PICKUP(8) PICKUP(8) Available in Postfix 3.3 and later: - service_name (read-only) - The master.cf service name of a Postfix daemon process, or the - process name of a non-daemon process. + service_name (read-only) + The master.cf service name of a Postfix daemon process. SEE ALSO cleanup(8), message canonicalization diff --git a/postfix/html/pipe.8.html b/postfix/html/pipe.8.html index 4aef6c17f..51504053d 100644 --- a/postfix/html/pipe.8.html +++ b/postfix/html/pipe.8.html @@ -468,9 +468,8 @@ PIPE(8) PIPE(8) address is rewritten to a different address (for example with aliasing or with canonical mapping). - service_name (read-only) - The master.cf service name of a Postfix daemon process, or the - process name of a non-daemon process. + service_name (read-only) + The master.cf service name of a Postfix daemon process. SEE ALSO qmgr(8), queue manager diff --git a/postfix/html/postconf.5.html b/postfix/html/postconf.5.html index f0e034f9d..859941dd0 100644 --- a/postfix/html/postconf.5.html +++ b/postfix/html/postconf.5.html @@ -10041,8 +10041,7 @@ submit mail into the Postfix queue. (read-only)

-The master.cf service name of a Postfix daemon process, or the -process name of a non-daemon process. +The master.cf service name of a Postfix daemon process.

diff --git a/postfix/html/postscreen.8.html b/postfix/html/postscreen.8.html index d41e03d1c..9d0732f3f 100644 --- a/postfix/html/postscreen.8.html +++ b/postfix/html/postscreen.8.html @@ -399,9 +399,8 @@ POSTSCREEN(8) POSTSCREEN(8) Available in Postfix 3.3 and later: - service_name (read-only) - The master.cf service name of a Postfix daemon process, or the - process name of a non-daemon process. + service_name (read-only) + The master.cf service name of a Postfix daemon process. SEE ALSO smtpd(8), Postfix SMTP server @@ -418,7 +417,7 @@ POSTSCREEN(8) POSTSCREEN(8) HISTORY This service was introduced with Postfix version 2.8. - Many ideas in postscreen(8) were explored in earlier work by Michael + Many ideas in postscreen(8) were explored in earlier work by Michael Tokarev, in OpenBSD spamd, and in MailChannels Traffic Control. AUTHOR(S) diff --git a/postfix/html/proxymap.8.html b/postfix/html/proxymap.8.html index 158f30197..8273e7850 100644 --- a/postfix/html/proxymap.8.html +++ b/postfix/html/proxymap.8.html @@ -191,9 +191,8 @@ PROXYMAP(8) PROXYMAP(8) Available in Postfix 3.3 and later: - service_name (read-only) - The master.cf service name of a Postfix daemon process, or the - process name of a non-daemon process. + service_name (read-only) + The master.cf service name of a Postfix daemon process. SEE ALSO postconf(5), configuration parameters diff --git a/postfix/html/qmgr.8.html b/postfix/html/qmgr.8.html index a6ab0654c..fd4be5e7b 100644 --- a/postfix/html/qmgr.8.html +++ b/postfix/html/qmgr.8.html @@ -455,9 +455,8 @@ QMGR(8) QMGR(8) Available in Postfix 3.3 and later: - service_name (read-only) - The master.cf service name of a Postfix daemon process, or the - process name of a non-daemon process. + service_name (read-only) + The master.cf service name of a Postfix daemon process. FILES /var/spool/postfix/incoming, incoming queue diff --git a/postfix/html/qmqpd.8.html b/postfix/html/qmqpd.8.html index 0fc684e87..ef4120d48 100644 --- a/postfix/html/qmqpd.8.html +++ b/postfix/html/qmqpd.8.html @@ -162,9 +162,8 @@ QMQPD(8) QMQPD(8) Available in Postfix 3.3 and later: - service_name (read-only) - The master.cf service name of a Postfix daemon process, or the - process name of a non-daemon process. + service_name (read-only) + The master.cf service name of a Postfix daemon process. SEE ALSO http://cr.yp.to/proto/qmqp.html, QMQP protocol diff --git a/postfix/html/scache.8.html b/postfix/html/scache.8.html index 4b8e5976b..3aa5a7471 100644 --- a/postfix/html/scache.8.html +++ b/postfix/html/scache.8.html @@ -131,9 +131,8 @@ SCACHE(8) SCACHE(8) Available in Postfix 3.3 and later: - service_name (read-only) - The master.cf service name of a Postfix daemon process, or the - process name of a non-daemon process. + service_name (read-only) + The master.cf service name of a Postfix daemon process. SEE ALSO smtp(8), SMTP client diff --git a/postfix/html/showq.8.html b/postfix/html/showq.8.html index a0c3534f4..5a5b563ea 100644 --- a/postfix/html/showq.8.html +++ b/postfix/html/showq.8.html @@ -92,9 +92,8 @@ SHOWQ(8) SHOWQ(8) Available in Postfix 3.3 and later: - service_name (read-only) - The master.cf service name of a Postfix daemon process, or the - process name of a non-daemon process. + service_name (read-only) + The master.cf service name of a Postfix daemon process. FILES /var/spool/postfix, queue directories diff --git a/postfix/html/smtp.8.html b/postfix/html/smtp.8.html index 68ab8d2b5..e5e0259c7 100644 --- a/postfix/html/smtp.8.html +++ b/postfix/html/smtp.8.html @@ -881,9 +881,8 @@ SMTP(8) SMTP(8) Available in Postfix 3.3 and later: - service_name (read-only) - The master.cf service name of a Postfix daemon process, or the - process name of a non-daemon process. + service_name (read-only) + The master.cf service name of a Postfix daemon process. SEE ALSO generic(5), output address rewriting diff --git a/postfix/html/smtpd.8.html b/postfix/html/smtpd.8.html index 527d0873b..141e8336f 100644 --- a/postfix/html/smtpd.8.html +++ b/postfix/html/smtpd.8.html @@ -1281,9 +1281,8 @@ SMTPD(8) SMTPD(8) Available in Postfix 3.3 and later: - service_name (read-only) - The master.cf service name of a Postfix daemon process, or the - process name of a non-daemon process. + service_name (read-only) + The master.cf service name of a Postfix daemon process. SEE ALSO anvil(8), connection/rate limiting diff --git a/postfix/html/spawn.8.html b/postfix/html/spawn.8.html index 77a54ad31..17166a9cd 100644 --- a/postfix/html/spawn.8.html +++ b/postfix/html/spawn.8.html @@ -123,9 +123,8 @@ SPAWN(8) SPAWN(8) Available in Postfix 3.3 and later: - service_name (read-only) - The master.cf service name of a Postfix daemon process, or the - process name of a non-daemon process. + service_name (read-only) + The master.cf service name of a Postfix daemon process. SEE ALSO postconf(5), configuration parameters diff --git a/postfix/html/tlsmgr.8.html b/postfix/html/tlsmgr.8.html index 54cfa3609..1c26f4fe0 100644 --- a/postfix/html/tlsmgr.8.html +++ b/postfix/html/tlsmgr.8.html @@ -151,9 +151,8 @@ TLSMGR(8) TLSMGR(8) Available in Postfix 3.3 and later: - service_name (read-only) - The master.cf service name of a Postfix daemon process, or the - process name of a non-daemon process. + service_name (read-only) + The master.cf service name of a Postfix daemon process. SEE ALSO smtp(8), Postfix SMTP client diff --git a/postfix/html/tlsproxy.8.html b/postfix/html/tlsproxy.8.html index 15e8cab78..de6084708 100644 --- a/postfix/html/tlsproxy.8.html +++ b/postfix/html/tlsproxy.8.html @@ -196,9 +196,8 @@ TLSPROXY(8) TLSPROXY(8) Available in Postfix 3.3 and later: - service_name (read-only) - The master.cf service name of a Postfix daemon process, or the - process name of a non-daemon process. + service_name (read-only) + The master.cf service name of a Postfix daemon process. SEE ALSO postscreen(8), Postfix zombie blocker diff --git a/postfix/html/trace.8.html b/postfix/html/trace.8.html index 3c8da1e53..9f6a7a8b4 100644 --- a/postfix/html/trace.8.html +++ b/postfix/html/trace.8.html @@ -150,9 +150,8 @@ BOUNCE(8) BOUNCE(8) Available in Postfix 3.3 and later: - service_name (read-only) - The master.cf service name of a Postfix daemon process, or the - process name of a non-daemon process. + service_name (read-only) + The master.cf service name of a Postfix daemon process. FILES /var/spool/postfix/bounce/* non-delivery records diff --git a/postfix/html/trivial-rewrite.8.html b/postfix/html/trivial-rewrite.8.html index b0aa38bba..fa8c34f6b 100644 --- a/postfix/html/trivial-rewrite.8.html +++ b/postfix/html/trivial-rewrite.8.html @@ -300,9 +300,8 @@ TRIVIAL-REWRITE(8) TRIVIAL-REWRITE(8) Available in Postfix 3.3 and later: - service_name (read-only) - The master.cf service name of a Postfix daemon process, or the - process name of a non-daemon process. + service_name (read-only) + The master.cf service name of a Postfix daemon process. SEE ALSO postconf(5), configuration parameters diff --git a/postfix/html/verify.8.html b/postfix/html/verify.8.html index c2332b2f4..3443f458d 100644 --- a/postfix/html/verify.8.html +++ b/postfix/html/verify.8.html @@ -207,9 +207,8 @@ VERIFY(8) VERIFY(8) Available in Postfix 3.3 and later: - service_name (read-only) - The master.cf service name of a Postfix daemon process, or the - process name of a non-daemon process. + service_name (read-only) + The master.cf service name of a Postfix daemon process. SEE ALSO smtpd(8), Postfix SMTP server diff --git a/postfix/html/virtual.8.html b/postfix/html/virtual.8.html index 737cc60f9..27709b000 100644 --- a/postfix/html/virtual.8.html +++ b/postfix/html/virtual.8.html @@ -276,9 +276,8 @@ VIRTUAL(8) VIRTUAL(8) address is rewritten to a different address (for example with aliasing or with canonical mapping). - service_name (read-only) - The master.cf service name of a Postfix daemon process, or the - process name of a non-daemon process. + service_name (read-only) + The master.cf service name of a Postfix daemon process. SEE ALSO qmgr(8), queue manager @@ -295,15 +294,15 @@ VIRTUAL(8) VIRTUAL(8) The Secure Mailer license must be distributed with this software. HISTORY - This delivery agent was originally based on the Postfix local delivery - agent. Modifications mainly consisted of removing code that either was + This delivery agent was originally based on the Postfix local delivery + agent. Modifications mainly consisted of removing code that either was not applicable or that was not safe in this context: aliases, ~user/.forward files, delivery to "|command" or to /file/name. - The Delivered-To: message header appears in the qmail system by Daniel + The Delivered-To: message header appears in the qmail system by Daniel Bernstein. - The maildir structure appears in the qmail system by Daniel Bernstein. + The maildir structure appears in the qmail system by Daniel Bernstein. AUTHOR(S) Wietse Venema diff --git a/postfix/man/man5/postconf.5 b/postfix/man/man5/postconf.5 index b60fcb793..6336691f6 100644 --- a/postfix/man/man5/postconf.5 +++ b/postfix/man/man5/postconf.5 @@ -6240,8 +6240,7 @@ A Sendmail compatibility feature that specifies the location of the Postfix \fBsendmail\fR(1) command. This command can be used to submit mail into the Postfix queue. .SH service_name (read\-only) -The master.cf service name of a Postfix daemon process, or the -process name of a non\-daemon process. +The master.cf service name of a Postfix daemon process. .SH service_throttle_time (default: 60s) How long the Postfix \fBmaster\fR(8) waits before forking a server that appears to be malfunctioning. diff --git a/postfix/man/man8/anvil.8 b/postfix/man/man8/anvil.8 index 2a43f6ff4..61d632d0f 100644 --- a/postfix/man/man8/anvil.8 +++ b/postfix/man/man8/anvil.8 @@ -258,8 +258,7 @@ records, so that, for example, "smtpd" becomes "prefix/smtpd". .PP Available in Postfix 3.3 and later: .IP "\fBservice_name (read\-only)\fR" -The master.cf service name of a Postfix daemon process, or the -process name of a non\-daemon process. +The master.cf service name of a Postfix daemon process. .SH "SEE ALSO" .na .nf diff --git a/postfix/man/man8/bounce.8 b/postfix/man/man8/bounce.8 index 4e1e750fd..846de4ea9 100644 --- a/postfix/man/man8/bounce.8 +++ b/postfix/man/man8/bounce.8 @@ -134,8 +134,7 @@ mail origin classes. .PP Available in Postfix 3.3 and later: .IP "\fBservice_name (read\-only)\fR" -The master.cf service name of a Postfix daemon process, or the -process name of a non\-daemon process. +The master.cf service name of a Postfix daemon process. .SH "FILES" .na .nf diff --git a/postfix/man/man8/cleanup.8 b/postfix/man/man8/cleanup.8 index c9c645348..6215c2381 100644 --- a/postfix/man/man8/cleanup.8 +++ b/postfix/man/man8/cleanup.8 @@ -430,8 +430,7 @@ aliasing or with canonical mapping). .PP Available in Postfix 3.3 and later: .IP "\fBservice_name (read\-only)\fR" -The master.cf service name of a Postfix daemon process, or the -process name of a non\-daemon process. +The master.cf service name of a Postfix daemon process. .SH "FILES" .na .nf diff --git a/postfix/man/man8/discard.8 b/postfix/man/man8/discard.8 index b2042c855..109a937a1 100644 --- a/postfix/man/man8/discard.8 +++ b/postfix/man/man8/discard.8 @@ -93,8 +93,7 @@ records, so that, for example, "smtpd" becomes "prefix/smtpd". .PP Available in Postfix 3.3 and later: .IP "\fBservice_name (read\-only)\fR" -The master.cf service name of a Postfix daemon process, or the -process name of a non\-daemon process. +The master.cf service name of a Postfix daemon process. .SH "SEE ALSO" .na .nf diff --git a/postfix/man/man8/dnsblog.8 b/postfix/man/man8/dnsblog.8 index 60759da82..7ad077dbf 100644 --- a/postfix/man/man8/dnsblog.8 +++ b/postfix/man/man8/dnsblog.8 @@ -73,8 +73,7 @@ records, so that, for example, "smtpd" becomes "prefix/smtpd". .PP Available in Postfix 3.3 and later: .IP "\fBservice_name (read\-only)\fR" -The master.cf service name of a Postfix daemon process, or the -process name of a non\-daemon process. +The master.cf service name of a Postfix daemon process. .SH "SEE ALSO" .na .nf diff --git a/postfix/man/man8/error.8 b/postfix/man/man8/error.8 index 815cb2cc7..96d07e495 100644 --- a/postfix/man/man8/error.8 +++ b/postfix/man/man8/error.8 @@ -103,8 +103,7 @@ records, so that, for example, "smtpd" becomes "prefix/smtpd". .PP Available in Postfix 3.3 and later: .IP "\fBservice_name (read\-only)\fR" -The master.cf service name of a Postfix daemon process, or the -process name of a non\-daemon process. +The master.cf service name of a Postfix daemon process. .SH "SEE ALSO" .na .nf diff --git a/postfix/man/man8/flush.8 b/postfix/man/man8/flush.8 index f22424b5f..ac1a13db7 100644 --- a/postfix/man/man8/flush.8 +++ b/postfix/man/man8/flush.8 @@ -133,8 +133,7 @@ records, so that, for example, "smtpd" becomes "prefix/smtpd". .PP Available in Postfix 3.3 and later: .IP "\fBservice_name (read\-only)\fR" -The master.cf service name of a Postfix daemon process, or the -process name of a non\-daemon process. +The master.cf service name of a Postfix daemon process. .SH "FILES" .na .nf diff --git a/postfix/man/man8/local.8 b/postfix/man/man8/local.8 index ce4c8fd16..7290c6e1e 100644 --- a/postfix/man/man8/local.8 +++ b/postfix/man/man8/local.8 @@ -602,8 +602,7 @@ Enable support for the original recipient address after an address is rewritten to a different address (for example with aliasing or with canonical mapping). .IP "\fBservice_name (read\-only)\fR" -The master.cf service name of a Postfix daemon process, or the -process name of a non\-daemon process. +The master.cf service name of a Postfix daemon process. .SH "FILES" .na .nf diff --git a/postfix/man/man8/master.8 b/postfix/man/man8/master.8 index c64b98380..1eda9afe7 100644 --- a/postfix/man/man8/master.8 +++ b/postfix/man/man8/master.8 @@ -164,8 +164,7 @@ records, so that, for example, "smtpd" becomes "prefix/smtpd". .PP Available in Postfix 3.3 and later: .IP "\fBservice_name (read\-only)\fR" -The master.cf service name of a Postfix daemon process, or the -process name of a non\-daemon process. +The master.cf service name of a Postfix daemon process. .SH "FILES" .na .nf diff --git a/postfix/man/man8/oqmgr.8 b/postfix/man/man8/oqmgr.8 index 8599450f5..53a44e07f 100644 --- a/postfix/man/man8/oqmgr.8 +++ b/postfix/man/man8/oqmgr.8 @@ -369,8 +369,7 @@ the sender when the delay clears up. .PP Available in Postfix 3.3 and later: .IP "\fBservice_name (read\-only)\fR" -The master.cf service name of a Postfix daemon process, or the -process name of a non\-daemon process. +The master.cf service name of a Postfix daemon process. .SH "FILES" .na .nf diff --git a/postfix/man/man8/pickup.8 b/postfix/man/man8/pickup.8 index a6dae20f5..26aeb7814 100644 --- a/postfix/man/man8/pickup.8 +++ b/postfix/man/man8/pickup.8 @@ -103,8 +103,7 @@ records, so that, for example, "smtpd" becomes "prefix/smtpd". .PP Available in Postfix 3.3 and later: .IP "\fBservice_name (read\-only)\fR" -The master.cf service name of a Postfix daemon process, or the -process name of a non\-daemon process. +The master.cf service name of a Postfix daemon process. .SH "SEE ALSO" .na .nf diff --git a/postfix/man/man8/pipe.8 b/postfix/man/man8/pipe.8 index 8727a27e0..d6564b71e 100644 --- a/postfix/man/man8/pipe.8 +++ b/postfix/man/man8/pipe.8 @@ -447,8 +447,7 @@ Enable support for the original recipient address after an address is rewritten to a different address (for example with aliasing or with canonical mapping). .IP "\fBservice_name (read\-only)\fR" -The master.cf service name of a Postfix daemon process, or the -process name of a non\-daemon process. +The master.cf service name of a Postfix daemon process. .SH "SEE ALSO" .na .nf diff --git a/postfix/man/man8/postscreen.8 b/postfix/man/man8/postscreen.8 index d2fcf6e6f..58570d394 100644 --- a/postfix/man/man8/postscreen.8 +++ b/postfix/man/man8/postscreen.8 @@ -402,8 +402,7 @@ records, so that, for example, "smtpd" becomes "prefix/smtpd". .PP Available in Postfix 3.3 and later: .IP "\fBservice_name (read\-only)\fR" -The master.cf service name of a Postfix daemon process, or the -process name of a non\-daemon process. +The master.cf service name of a Postfix daemon process. .SH "SEE ALSO" .na .nf diff --git a/postfix/man/man8/proxymap.8 b/postfix/man/man8/proxymap.8 index b7ffba0d4..de196638c 100644 --- a/postfix/man/man8/proxymap.8 +++ b/postfix/man/man8/proxymap.8 @@ -200,8 +200,7 @@ access for the read\-write service. .PP Available in Postfix 3.3 and later: .IP "\fBservice_name (read\-only)\fR" -The master.cf service name of a Postfix daemon process, or the -process name of a non\-daemon process. +The master.cf service name of a Postfix daemon process. .SH "SEE ALSO" .na .nf diff --git a/postfix/man/man8/qmgr.8 b/postfix/man/man8/qmgr.8 index 76ce9f6a4..4b7d040e2 100644 --- a/postfix/man/man8/qmgr.8 +++ b/postfix/man/man8/qmgr.8 @@ -433,8 +433,7 @@ the sender when the delay clears up. .PP Available in Postfix 3.3 and later: .IP "\fBservice_name (read\-only)\fR" -The master.cf service name of a Postfix daemon process, or the -process name of a non\-daemon process. +The master.cf service name of a Postfix daemon process. .SH "FILES" .na .nf diff --git a/postfix/man/man8/qmqpd.8 b/postfix/man/man8/qmqpd.8 index 020ba505e..93cdddb45 100644 --- a/postfix/man/man8/qmqpd.8 +++ b/postfix/man/man8/qmqpd.8 @@ -167,8 +167,7 @@ the hostname and IP address. .PP Available in Postfix 3.3 and later: .IP "\fBservice_name (read\-only)\fR" -The master.cf service name of a Postfix daemon process, or the -process name of a non\-daemon process. +The master.cf service name of a Postfix daemon process. .SH "SEE ALSO" .na .nf diff --git a/postfix/man/man8/scache.8 b/postfix/man/man8/scache.8 index c5da8e901..771905b0d 100644 --- a/postfix/man/man8/scache.8 +++ b/postfix/man/man8/scache.8 @@ -134,8 +134,7 @@ records, so that, for example, "smtpd" becomes "prefix/smtpd". .PP Available in Postfix 3.3 and later: .IP "\fBservice_name (read\-only)\fR" -The master.cf service name of a Postfix daemon process, or the -process name of a non\-daemon process. +The master.cf service name of a Postfix daemon process. .SH "SEE ALSO" .na .nf diff --git a/postfix/man/man8/showq.8 b/postfix/man/man8/showq.8 index 0a31d5908..380f28c0a 100644 --- a/postfix/man/man8/showq.8 +++ b/postfix/man/man8/showq.8 @@ -89,8 +89,7 @@ Enable long, non\-repeating, queue IDs (queue file names). .PP Available in Postfix 3.3 and later: .IP "\fBservice_name (read\-only)\fR" -The master.cf service name of a Postfix daemon process, or the -process name of a non\-daemon process. +The master.cf service name of a Postfix daemon process. .SH "FILES" .na .nf diff --git a/postfix/man/man8/smtp.8 b/postfix/man/man8/smtp.8 index 5cd85af7f..f3f24c5b8 100644 --- a/postfix/man/man8/smtp.8 +++ b/postfix/man/man8/smtp.8 @@ -768,8 +768,7 @@ The default TCP port that the Postfix SMTP client connects to. .PP Available in Postfix 3.3 and later: .IP "\fBservice_name (read\-only)\fR" -The master.cf service name of a Postfix daemon process, or the -process name of a non\-daemon process. +The master.cf service name of a Postfix daemon process. .SH "SEE ALSO" .na .nf diff --git a/postfix/man/man8/smtpd.8 b/postfix/man/man8/smtpd.8 index 4650b6dec..10db32d00 100644 --- a/postfix/man/man8/smtpd.8 +++ b/postfix/man/man8/smtpd.8 @@ -1113,8 +1113,7 @@ the hostname and IP address. .PP Available in Postfix 3.3 and later: .IP "\fBservice_name (read\-only)\fR" -The master.cf service name of a Postfix daemon process, or the -process name of a non\-daemon process. +The master.cf service name of a Postfix daemon process. .SH "SEE ALSO" .na .nf diff --git a/postfix/man/man8/spawn.8 b/postfix/man/man8/spawn.8 index 2a5fb26c9..edbec5b09 100644 --- a/postfix/man/man8/spawn.8 +++ b/postfix/man/man8/spawn.8 @@ -128,8 +128,7 @@ records, so that, for example, "smtpd" becomes "prefix/smtpd". .PP Available in Postfix 3.3 and later: .IP "\fBservice_name (read\-only)\fR" -The master.cf service name of a Postfix daemon process, or the -process name of a non\-daemon process. +The master.cf service name of a Postfix daemon process. .SH "SEE ALSO" .na .nf diff --git a/postfix/man/man8/tlsmgr.8 b/postfix/man/man8/tlsmgr.8 index cd5aad981..fdd38a5b0 100644 --- a/postfix/man/man8/tlsmgr.8 +++ b/postfix/man/man8/tlsmgr.8 @@ -155,8 +155,7 @@ records, so that, for example, "smtpd" becomes "prefix/smtpd". .PP Available in Postfix 3.3 and later: .IP "\fBservice_name (read\-only)\fR" -The master.cf service name of a Postfix daemon process, or the -process name of a non\-daemon process. +The master.cf service name of a Postfix daemon process. .SH "SEE ALSO" .na .nf diff --git a/postfix/man/man8/tlsproxy.8 b/postfix/man/man8/tlsproxy.8 index 149bbb3e3..2d439ac28 100644 --- a/postfix/man/man8/tlsproxy.8 +++ b/postfix/man/man8/tlsproxy.8 @@ -193,8 +193,7 @@ records, so that, for example, "smtpd" becomes "prefix/smtpd". .PP Available in Postfix 3.3 and later: .IP "\fBservice_name (read\-only)\fR" -The master.cf service name of a Postfix daemon process, or the -process name of a non\-daemon process. +The master.cf service name of a Postfix daemon process. .SH "SEE ALSO" .na .nf diff --git a/postfix/man/man8/trivial-rewrite.8 b/postfix/man/man8/trivial-rewrite.8 index 061340260..c122d3b94 100644 --- a/postfix/man/man8/trivial-rewrite.8 +++ b/postfix/man/man8/trivial-rewrite.8 @@ -284,8 +284,7 @@ helpful suggestions. .PP Available in Postfix 3.3 and later: .IP "\fBservice_name (read\-only)\fR" -The master.cf service name of a Postfix daemon process, or the -process name of a non\-daemon process. +The master.cf service name of a Postfix daemon process. .SH "SEE ALSO" .na .nf diff --git a/postfix/man/man8/verify.8 b/postfix/man/man8/verify.8 index 6898e241f..b2e677223 100644 --- a/postfix/man/man8/verify.8 +++ b/postfix/man/man8/verify.8 @@ -211,8 +211,7 @@ records, so that, for example, "smtpd" becomes "prefix/smtpd". .PP Available in Postfix 3.3 and later: .IP "\fBservice_name (read\-only)\fR" -The master.cf service name of a Postfix daemon process, or the -process name of a non\-daemon process. +The master.cf service name of a Postfix daemon process. .SH "SEE ALSO" .na .nf diff --git a/postfix/man/man8/virtual.8 b/postfix/man/man8/virtual.8 index 025987b76..99520ae88 100644 --- a/postfix/man/man8/virtual.8 +++ b/postfix/man/man8/virtual.8 @@ -296,8 +296,7 @@ Enable support for the original recipient address after an address is rewritten to a different address (for example with aliasing or with canonical mapping). .IP "\fBservice_name (read\-only)\fR" -The master.cf service name of a Postfix daemon process, or the -process name of a non\-daemon process. +The master.cf service name of a Postfix daemon process. .SH "SEE ALSO" .na .nf diff --git a/postfix/mantools/postlink b/postfix/mantools/postlink index eef4c0e70..4f07119a1 100755 --- a/postfix/mantools/postlink +++ b/postfix/mantools/postlink @@ -391,6 +391,7 @@ while (<>) { s;\bqmgr_daemon_timeout\b;$&;g; s;\bqmgr_ipc_timeout\b;$&;g; s;\bqmqpd_authorized_clients\b;$&;g; + s;\bservice_name\b;$&;g; s;\bdefault_desti[-]*\n* *[]*na[-]*\n* *[]*tion_concur[-]*\n* *[]*rency_negative_feedback\b;$&;g; s;\bdefault_desti[-]*\n* *[]*na[-]*\n* *[]*tion_concur[-]*\n* *[]*rency_positive_feedback\b;$&;g; diff --git a/postfix/proto/postconf.proto b/postfix/proto/postconf.proto index 6b779b269..1b1363aa5 100644 --- a/postfix/proto/postconf.proto +++ b/postfix/proto/postconf.proto @@ -8134,8 +8134,7 @@ The process name of a Postfix command or daemon process. %PARAM service_name read-only

-The master.cf service name of a Postfix daemon process, or the -process name of a non-daemon process. +The master.cf service name of a Postfix daemon process.

%PARAM process_id read-only diff --git a/postfix/src/anvil/anvil.c b/postfix/src/anvil/anvil.c index 48495a006..4625f28ba 100644 --- a/postfix/src/anvil/anvil.c +++ b/postfix/src/anvil/anvil.c @@ -234,8 +234,7 @@ /* .PP /* Available in Postfix 3.3 and later: /* .IP "\fBservice_name (read-only)\fR" -/* The master.cf service name of a Postfix daemon process, or the -/* process name of a non-daemon process. +/* The master.cf service name of a Postfix daemon process. /* SEE ALSO /* smtpd(8), Postfix SMTP server /* postconf(5), configuration parameters diff --git a/postfix/src/bounce/bounce.c b/postfix/src/bounce/bounce.c index 826464832..462fe0a8c 100644 --- a/postfix/src/bounce/bounce.c +++ b/postfix/src/bounce/bounce.c @@ -122,8 +122,7 @@ /* .PP /* Available in Postfix 3.3 and later: /* .IP "\fBservice_name (read-only)\fR" -/* The master.cf service name of a Postfix daemon process, or the -/* process name of a non-daemon process. +/* The master.cf service name of a Postfix daemon process. /* FILES /* /var/spool/postfix/bounce/* non-delivery records /* /var/spool/postfix/defer/* non-delivery records diff --git a/postfix/src/cleanup/cleanup.c b/postfix/src/cleanup/cleanup.c index 19fb1fea0..a019c3b0e 100644 --- a/postfix/src/cleanup/cleanup.c +++ b/postfix/src/cleanup/cleanup.c @@ -398,8 +398,7 @@ /* .PP /* Available in Postfix 3.3 and later: /* .IP "\fBservice_name (read-only)\fR" -/* The master.cf service name of a Postfix daemon process, or the -/* process name of a non-daemon process. +/* The master.cf service name of a Postfix daemon process. /* FILES /* /etc/postfix/canonical*, canonical mapping table /* /etc/postfix/virtual*, virtual mapping table diff --git a/postfix/src/discard/discard.c b/postfix/src/discard/discard.c index b5d13a25f..2ceb4793e 100644 --- a/postfix/src/discard/discard.c +++ b/postfix/src/discard/discard.c @@ -79,8 +79,7 @@ /* .PP /* Available in Postfix 3.3 and later: /* .IP "\fBservice_name (read-only)\fR" -/* The master.cf service name of a Postfix daemon process, or the -/* process name of a non-daemon process. +/* The master.cf service name of a Postfix daemon process. /* SEE ALSO /* qmgr(8), queue manager /* bounce(8), delivery status reports diff --git a/postfix/src/dnsblog/dnsblog.c b/postfix/src/dnsblog/dnsblog.c index eaf5dbada..8b2784740 100644 --- a/postfix/src/dnsblog/dnsblog.c +++ b/postfix/src/dnsblog/dnsblog.c @@ -61,8 +61,7 @@ /* .PP /* Available in Postfix 3.3 and later: /* .IP "\fBservice_name (read-only)\fR" -/* The master.cf service name of a Postfix daemon process, or the -/* process name of a non-daemon process. +/* The master.cf service name of a Postfix daemon process. /* SEE ALSO /* smtpd(8), Postfix SMTP server /* postconf(5), configuration parameters diff --git a/postfix/src/error/error.c b/postfix/src/error/error.c index 0b1fd5fcc..0e65fc8e8 100644 --- a/postfix/src/error/error.c +++ b/postfix/src/error/error.c @@ -89,8 +89,7 @@ /* .PP /* Available in Postfix 3.3 and later: /* .IP "\fBservice_name (read-only)\fR" -/* The master.cf service name of a Postfix daemon process, or the -/* process name of a non-daemon process. +/* The master.cf service name of a Postfix daemon process. /* SEE ALSO /* qmgr(8), queue manager /* bounce(8), delivery status reports diff --git a/postfix/src/flush/flush.c b/postfix/src/flush/flush.c index e8958c0c2..820a53e2d 100644 --- a/postfix/src/flush/flush.c +++ b/postfix/src/flush/flush.c @@ -119,8 +119,7 @@ /* .PP /* Available in Postfix 3.3 and later: /* .IP "\fBservice_name (read-only)\fR" -/* The master.cf service name of a Postfix daemon process, or the -/* process name of a non-daemon process. +/* The master.cf service name of a Postfix daemon process. /* FILES /* /var/spool/postfix/flush, "fast flush" logfiles. /* SEE ALSO diff --git a/postfix/src/global/mail_version.h b/postfix/src/global/mail_version.h index c49862b9d..6a8f2a05b 100644 --- a/postfix/src/global/mail_version.h +++ b/postfix/src/global/mail_version.h @@ -20,7 +20,7 @@ * Patches change both the patchlevel and the release date. Snapshots have no * patchlevel; they change the release date only. */ -#define MAIL_RELEASE_DATE "20180113" +#define MAIL_RELEASE_DATE "20180114" #define MAIL_VERSION_NUMBER "3.3" #ifdef SNAPSHOT diff --git a/postfix/src/local/local.c b/postfix/src/local/local.c index cbf226110..75d7866f1 100644 --- a/postfix/src/local/local.c +++ b/postfix/src/local/local.c @@ -558,8 +558,7 @@ /* address is rewritten to a different address (for example with /* aliasing or with canonical mapping). /* .IP "\fBservice_name (read-only)\fR" -/* The master.cf service name of a Postfix daemon process, or the -/* process name of a non-daemon process. +/* The master.cf service name of a Postfix daemon process. /* FILES /* The following are examples; details differ between systems. /* $HOME/.forward, per-user aliasing diff --git a/postfix/src/master/master.c b/postfix/src/master/master.c index edba574cf..846b2a415 100644 --- a/postfix/src/master/master.c +++ b/postfix/src/master/master.c @@ -148,8 +148,7 @@ /* .PP /* Available in Postfix 3.3 and later: /* .IP "\fBservice_name (read-only)\fR" -/* The master.cf service name of a Postfix daemon process, or the -/* process name of a non-daemon process. +/* The master.cf service name of a Postfix daemon process. /* FILES /* .ad /* .fi diff --git a/postfix/src/oqmgr/qmgr.c b/postfix/src/oqmgr/qmgr.c index 4eb0083fc..ac713c147 100644 --- a/postfix/src/oqmgr/qmgr.c +++ b/postfix/src/oqmgr/qmgr.c @@ -331,8 +331,7 @@ /* .PP /* Available in Postfix 3.3 and later: /* .IP "\fBservice_name (read-only)\fR" -/* The master.cf service name of a Postfix daemon process, or the -/* process name of a non-daemon process. +/* The master.cf service name of a Postfix daemon process. /* FILES /* /var/spool/postfix/incoming, incoming queue /* /var/spool/postfix/active, active queue diff --git a/postfix/src/pickup/pickup.c b/postfix/src/pickup/pickup.c index 46804d26f..02832a545 100644 --- a/postfix/src/pickup/pickup.c +++ b/postfix/src/pickup/pickup.c @@ -83,8 +83,7 @@ /* .PP /* Available in Postfix 3.3 and later: /* .IP "\fBservice_name (read-only)\fR" -/* The master.cf service name of a Postfix daemon process, or the -/* process name of a non-daemon process. +/* The master.cf service name of a Postfix daemon process. /* SEE ALSO /* cleanup(8), message canonicalization /* sendmail(1), Sendmail-compatible interface diff --git a/postfix/src/pipe/pipe.c b/postfix/src/pipe/pipe.c index db8c4422e..5eb5f21b2 100644 --- a/postfix/src/pipe/pipe.c +++ b/postfix/src/pipe/pipe.c @@ -425,8 +425,7 @@ /* address is rewritten to a different address (for example with /* aliasing or with canonical mapping). /* .IP "\fBservice_name (read-only)\fR" -/* The master.cf service name of a Postfix daemon process, or the -/* process name of a non-daemon process. +/* The master.cf service name of a Postfix daemon process. /* SEE ALSO /* qmgr(8), queue manager /* bounce(8), delivery status reports diff --git a/postfix/src/postqueue/postqueue.c b/postfix/src/postqueue/postqueue.c index f18fb4739..b278e040a 100644 --- a/postfix/src/postqueue/postqueue.c +++ b/postfix/src/postqueue/postqueue.c @@ -570,9 +570,9 @@ int main(int argc, char **argv) * Initialize. Set up logging, read the global configuration file and * extract configuration information. Set up signal handlers so that we * can clean up incomplete output. + * Censor the process name: it is provided by the user. */ - if ((slash = strrchr(argv[0], '/')) != 0 && slash[1]) - argv[0] = slash + 1; + argv[0] = "postqueue"; msg_vstream_init(argv[0], VSTREAM_ERR); msg_cleanup(unavailable); msg_syslog_init(mail_task("postqueue"), LOG_PID, LOG_FACILITY); diff --git a/postfix/src/postscreen/postscreen.c b/postfix/src/postscreen/postscreen.c index 976bdf914..e68482039 100644 --- a/postfix/src/postscreen/postscreen.c +++ b/postfix/src/postscreen/postscreen.c @@ -362,8 +362,7 @@ /* .PP /* Available in Postfix 3.3 and later: /* .IP "\fBservice_name (read-only)\fR" -/* The master.cf service name of a Postfix daemon process, or the -/* process name of a non-daemon process. +/* The master.cf service name of a Postfix daemon process. /* SEE ALSO /* smtpd(8), Postfix SMTP server /* tlsproxy(8), Postfix TLS proxy server diff --git a/postfix/src/proxymap/proxymap.c b/postfix/src/proxymap/proxymap.c index 4eeae1a84..28d6c507d 100644 --- a/postfix/src/proxymap/proxymap.c +++ b/postfix/src/proxymap/proxymap.c @@ -184,8 +184,7 @@ /* .PP /* Available in Postfix 3.3 and later: /* .IP "\fBservice_name (read-only)\fR" -/* The master.cf service name of a Postfix daemon process, or the -/* process name of a non-daemon process. +/* The master.cf service name of a Postfix daemon process. /* SEE ALSO /* postconf(5), configuration parameters /* master(5), generic daemon options diff --git a/postfix/src/qmgr/qmgr.c b/postfix/src/qmgr/qmgr.c index 143da8acf..6c64cd648 100644 --- a/postfix/src/qmgr/qmgr.c +++ b/postfix/src/qmgr/qmgr.c @@ -393,8 +393,7 @@ /* .PP /* Available in Postfix 3.3 and later: /* .IP "\fBservice_name (read-only)\fR" -/* The master.cf service name of a Postfix daemon process, or the -/* process name of a non-daemon process. +/* The master.cf service name of a Postfix daemon process. /* FILES /* /var/spool/postfix/incoming, incoming queue /* /var/spool/postfix/active, active queue diff --git a/postfix/src/qmqpd/qmqpd.c b/postfix/src/qmqpd/qmqpd.c index 0d1af9945..8cbd20986 100644 --- a/postfix/src/qmqpd/qmqpd.c +++ b/postfix/src/qmqpd/qmqpd.c @@ -141,8 +141,7 @@ /* .PP /* Available in Postfix 3.3 and later: /* .IP "\fBservice_name (read-only)\fR" -/* The master.cf service name of a Postfix daemon process, or the -/* process name of a non-daemon process. +/* The master.cf service name of a Postfix daemon process. /* SEE ALSO /* http://cr.yp.to/proto/qmqp.html, QMQP protocol /* cleanup(8), message canonicalization diff --git a/postfix/src/scache/scache.c b/postfix/src/scache/scache.c index f49aa9d6a..ca2c30a2d 100644 --- a/postfix/src/scache/scache.c +++ b/postfix/src/scache/scache.c @@ -116,8 +116,7 @@ /* .PP /* Available in Postfix 3.3 and later: /* .IP "\fBservice_name (read-only)\fR" -/* The master.cf service name of a Postfix daemon process, or the -/* process name of a non-daemon process. +/* The master.cf service name of a Postfix daemon process. /* SEE ALSO /* smtp(8), SMTP client /* postconf(5), configuration parameters diff --git a/postfix/src/showq/showq.c b/postfix/src/showq/showq.c index 5f941f8f4..285801acb 100644 --- a/postfix/src/showq/showq.c +++ b/postfix/src/showq/showq.c @@ -75,8 +75,7 @@ /* .PP /* Available in Postfix 3.3 and later: /* .IP "\fBservice_name (read-only)\fR" -/* The master.cf service name of a Postfix daemon process, or the -/* process name of a non-daemon process. +/* The master.cf service name of a Postfix daemon process. /* FILES /* /var/spool/postfix, queue directories /* SEE ALSO diff --git a/postfix/src/smtp/smtp.c b/postfix/src/smtp/smtp.c index 73449ea4c..ed27be96a 100644 --- a/postfix/src/smtp/smtp.c +++ b/postfix/src/smtp/smtp.c @@ -728,8 +728,7 @@ /* .PP /* Available in Postfix 3.3 and later: /* .IP "\fBservice_name (read-only)\fR" -/* The master.cf service name of a Postfix daemon process, or the -/* process name of a non-daemon process. +/* The master.cf service name of a Postfix daemon process. /* SEE ALSO /* generic(5), output address rewriting /* header_checks(5), message header content inspection diff --git a/postfix/src/smtpd/smtpd.c b/postfix/src/smtpd/smtpd.c index ad9858916..20598992b 100644 --- a/postfix/src/smtpd/smtpd.c +++ b/postfix/src/smtpd/smtpd.c @@ -1055,8 +1055,7 @@ /* .PP /* Available in Postfix 3.3 and later: /* .IP "\fBservice_name (read-only)\fR" -/* The master.cf service name of a Postfix daemon process, or the -/* process name of a non-daemon process. +/* The master.cf service name of a Postfix daemon process. /* SEE ALSO /* anvil(8), connection/rate limiting /* cleanup(8), message canonicalization diff --git a/postfix/src/spawn/spawn.c b/postfix/src/spawn/spawn.c index 0eabd8b0b..725612c68 100644 --- a/postfix/src/spawn/spawn.c +++ b/postfix/src/spawn/spawn.c @@ -108,8 +108,7 @@ /* .PP /* Available in Postfix 3.3 and later: /* .IP "\fBservice_name (read-only)\fR" -/* The master.cf service name of a Postfix daemon process, or the -/* process name of a non-daemon process. +/* The master.cf service name of a Postfix daemon process. /* SEE ALSO /* postconf(5), configuration parameters /* master(8), process manager diff --git a/postfix/src/tlsmgr/tlsmgr.c b/postfix/src/tlsmgr/tlsmgr.c index cf2ecc290..96f0485c2 100644 --- a/postfix/src/tlsmgr/tlsmgr.c +++ b/postfix/src/tlsmgr/tlsmgr.c @@ -135,8 +135,7 @@ /* .PP /* Available in Postfix 3.3 and later: /* .IP "\fBservice_name (read-only)\fR" -/* The master.cf service name of a Postfix daemon process, or the -/* process name of a non-daemon process. +/* The master.cf service name of a Postfix daemon process. /* SEE ALSO /* smtp(8), Postfix SMTP client /* smtpd(8), Postfix SMTP server diff --git a/postfix/src/tlsproxy/tlsproxy.c b/postfix/src/tlsproxy/tlsproxy.c index 3883323f3..808689c24 100644 --- a/postfix/src/tlsproxy/tlsproxy.c +++ b/postfix/src/tlsproxy/tlsproxy.c @@ -171,8 +171,7 @@ /* .PP /* Available in Postfix 3.3 and later: /* .IP "\fBservice_name (read-only)\fR" -/* The master.cf service name of a Postfix daemon process, or the -/* process name of a non-daemon process. +/* The master.cf service name of a Postfix daemon process. /* SEE ALSO /* postscreen(8), Postfix zombie blocker /* smtpd(8), Postfix SMTP server diff --git a/postfix/src/trivial-rewrite/trivial-rewrite.c b/postfix/src/trivial-rewrite/trivial-rewrite.c index 4e194fa87..cb49e77e2 100644 --- a/postfix/src/trivial-rewrite/trivial-rewrite.c +++ b/postfix/src/trivial-rewrite/trivial-rewrite.c @@ -258,8 +258,7 @@ /* .PP /* Available in Postfix 3.3 and later: /* .IP "\fBservice_name (read-only)\fR" -/* The master.cf service name of a Postfix daemon process, or the -/* process name of a non-daemon process. +/* The master.cf service name of a Postfix daemon process. /* SEE ALSO /* postconf(5), configuration parameters /* transport(5), transport table format diff --git a/postfix/src/verify/verify.c b/postfix/src/verify/verify.c index 3f014dbbe..0fecb9097 100644 --- a/postfix/src/verify/verify.c +++ b/postfix/src/verify/verify.c @@ -187,8 +187,7 @@ /* .PP /* Available in Postfix 3.3 and later: /* .IP "\fBservice_name (read-only)\fR" -/* The master.cf service name of a Postfix daemon process, or the -/* process name of a non-daemon process. +/* The master.cf service name of a Postfix daemon process. /* SEE ALSO /* smtpd(8), Postfix SMTP server /* cleanup(8), enqueue Postfix message diff --git a/postfix/src/virtual/virtual.c b/postfix/src/virtual/virtual.c index 622ec2302..d78171347 100644 --- a/postfix/src/virtual/virtual.c +++ b/postfix/src/virtual/virtual.c @@ -260,8 +260,7 @@ /* address is rewritten to a different address (for example with /* aliasing or with canonical mapping). /* .IP "\fBservice_name (read-only)\fR" -/* The master.cf service name of a Postfix daemon process, or the -/* process name of a non-daemon process. +/* The master.cf service name of a Postfix daemon process. /* SEE ALSO /* qmgr(8), queue manager /* bounce(8), delivery status reports