]> git.ipfire.org Git - thirdparty/postfix.git/commitdiff
postfix-3.3-20180113
authorWietse Venema <wietse@porcupine.org>
Sat, 13 Jan 2018 05:00:00 +0000 (00:00 -0500)
committerViktor Dukhovni <postfix-users@dukhovni.org>
Wed, 17 Jan 2018 06:42:51 +0000 (01:42 -0500)
106 files changed:
postfix/HISTORY
postfix/WISHLIST
postfix/html/anvil.8.html
postfix/html/bounce.8.html
postfix/html/cleanup.8.html
postfix/html/defer.8.html
postfix/html/discard.8.html
postfix/html/dnsblog.8.html
postfix/html/error.8.html
postfix/html/flush.8.html
postfix/html/lmtp.8.html
postfix/html/local.8.html
postfix/html/master.8.html
postfix/html/oqmgr.8.html
postfix/html/pickup.8.html
postfix/html/pipe.8.html
postfix/html/postconf.5.html
postfix/html/postscreen.8.html
postfix/html/proxymap.8.html
postfix/html/qmgr.8.html
postfix/html/qmqpd.8.html
postfix/html/scache.8.html
postfix/html/showq.8.html
postfix/html/smtp.8.html
postfix/html/smtpd.8.html
postfix/html/spawn.8.html
postfix/html/tlsmgr.8.html
postfix/html/tlsproxy.8.html
postfix/html/trace.8.html
postfix/html/trivial-rewrite.8.html
postfix/html/verify.8.html
postfix/html/virtual.8.html
postfix/man/man5/postconf.5
postfix/man/man8/anvil.8
postfix/man/man8/bounce.8
postfix/man/man8/cleanup.8
postfix/man/man8/discard.8
postfix/man/man8/dnsblog.8
postfix/man/man8/error.8
postfix/man/man8/flush.8
postfix/man/man8/local.8
postfix/man/man8/master.8
postfix/man/man8/oqmgr.8
postfix/man/man8/pickup.8
postfix/man/man8/pipe.8
postfix/man/man8/postscreen.8
postfix/man/man8/proxymap.8
postfix/man/man8/qmgr.8
postfix/man/man8/qmqpd.8
postfix/man/man8/scache.8
postfix/man/man8/showq.8
postfix/man/man8/smtp.8
postfix/man/man8/smtpd.8
postfix/man/man8/spawn.8
postfix/man/man8/tlsmgr.8
postfix/man/man8/tlsproxy.8
postfix/man/man8/trivial-rewrite.8
postfix/man/man8/verify.8
postfix/man/man8/virtual.8
postfix/proto/postconf.proto
postfix/src/anvil/anvil.c
postfix/src/bounce/bounce.c
postfix/src/cleanup/cleanup.c
postfix/src/discard/discard.c
postfix/src/dnsblog/dnsblog.c
postfix/src/error/error.c
postfix/src/flush/flush.c
postfix/src/global/mail_params.c
postfix/src/global/mail_params.h
postfix/src/global/mail_version.h
postfix/src/local/local.c
postfix/src/master/event_server.c
postfix/src/master/master.c
postfix/src/master/multi_server.c
postfix/src/master/single_server.c
postfix/src/master/trigger_server.c
postfix/src/oqmgr/qmgr.c
postfix/src/pickup/pickup.c
postfix/src/pipe/pipe.c
postfix/src/postconf/Makefile.in
postfix/src/postconf/postconf.c
postfix/src/postconf/postconf.h
postfix/src/postconf/postconf_builtin.c
postfix/src/postconf/postconf_lookup.c
postfix/src/postconf/postconf_master.c
postfix/src/postconf/test40.ref
postfix/src/postconf/test41.ref
postfix/src/postconf/test42.ref
postfix/src/postconf/test43.ref
postfix/src/postconf/test44.ref
postfix/src/postconf/test59.ref
postfix/src/postconf/test67.ref [new file with mode: 0644]
postfix/src/postscreen/postscreen.c
postfix/src/proxymap/proxymap.c
postfix/src/qmgr/qmgr.c
postfix/src/qmqpd/qmqpd.c
postfix/src/scache/scache.c
postfix/src/showq/showq.c
postfix/src/smtp/smtp.c
postfix/src/smtpd/smtpd.c
postfix/src/spawn/spawn.c
postfix/src/tlsmgr/tlsmgr.c
postfix/src/tlsproxy/tlsproxy.c
postfix/src/trivial-rewrite/trivial-rewrite.c
postfix/src/verify/verify.c
postfix/src/virtual/virtual.c

index af830109ec0f43981cf5fa31d3d61924b9ad40ea..e3b046f589070209bd21cd05f6ed1eef5c261652 100644 (file)
@@ -23267,3 +23267,22 @@ Apologies for any names omitted.
        earlier form "From: address (name)". Files: proto/postconf.proto,
        cleanup/cleanup.h, cleanup_init.c, cleanup_message.c,
        mail_params.h.
+
+20180113
+
+       Bugfix: "postconf -M" commands did not warn about unused
+       name=value settings in master.cf. File: postconf/postconf.c.
+
+       Bugfix: "postconf -xM" now expands $process_name using the
+       daemon file name in master.cf, instead of the "postconf"
+       command process name. Files: postconf/postconf.h,
+       postconf/postconf_lookup.c, postconf/postconf_master.c.
+
+       Feature: read-only service_name parameter that contains the
+       master.cf service name. This allows, for example, setting
+       the syslog_name with "-o syslog_name=postfix/$service_name"
+       for the "submission" and "smtps" services. Files:
+       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.
index eb61461bb55fa4d57a34b39f5cd19a8e26606a0e..e9ae0082d5bcc590802718885f9b31b0a57be4f5 100644 (file)
@@ -6,15 +6,11 @@ Wish list:
 
        Disable -DSNAPSHOT and -DNONPROD in makedefs.
 
+       Add $smtpd_sender_login_maps to proxy_read_maps.
+
        After I/O error, store errno in VSTREAM object before errno
        may be overwritten.
 
-       Make the service name (daemon -n option) available as a
-       main.cf style parameter.  This may allow simpler configuration
-       in master.cf, e.g., syslog_name=postfix/$name/smtpd.
-
-       Add $smtpd_sender_login_maps to proxy_read_maps.
-
        Add some tips for logging from container:
        https://www.projectatomic.io/blog/2016/10/playing-with-docker-logging/;
        syslog_name = $myhostname/postfix; mkdir queue and data
index c65d26a40ea28960a250b159b51fd8b3b22cce4b..9ee797b57bcd94cf96f3fadd28bdac5273cfffb1 100644 (file)
@@ -208,6 +208,12 @@ ANVIL(8)                                                              ANVIL(8)
               A prefix that  is  prepended  to  the  process  name  in  syslog
               records, so that, for example, "smtpd" becomes "prefix/smtpd".
 
+       Available in Postfix 3.3 and later:
+
+       <b>service_name (read-only)</b>
+              The  <a href="master.5.html">master.cf</a>  service name of a Postfix daemon process, or the
+              process name of a non-daemon process.
+
 <b>SEE ALSO</b>
        <a href="smtpd.8.html">smtpd(8)</a>, Postfix SMTP server
        <a href="postconf.5.html">postconf(5)</a>, configuration parameters
index 0a7a36ce72691593662733f29267448e829955a8..3c8da1e53c663cfd0f388ba051f026270d6386b9 100644 (file)
@@ -148,6 +148,12 @@ BOUNCE(8)                                                            BOUNCE(8)
               Detect  that  a message requires SMTPUTF8 support for the speci-
               fied mail origin classes.
 
+       Available in Postfix 3.3 and later:
+
+       <b>service_name (read-only)</b>
+              The <a href="master.5.html">master.cf</a> service name of a Postfix daemon process,  or  the
+              process name of a non-daemon process.
+
 <b>FILES</b>
        /var/spool/postfix/bounce/* non-delivery records
        /var/spool/postfix/defer/* non-delivery records
index bc313acb560e132b16ad0dc7e7eae6d95dbf23e7..544aac00ce94b4014272c4093a071f03cadb352a 100644 (file)
@@ -480,7 +480,15 @@ CLEANUP(8)                                                          CLEANUP(8)
        Available in Postfix version 2.1 and later:
 
        <b><a href="postconf.5.html#enable_original_recipient">enable_original_recipient</a> (yes)</b>
-              Enable support for the X-Original-To message header.
+              Enable support for  the  original  recipient  address  after  an
+              address  is  rewritten  to a different address (for example with
+              aliasing or with canonical mapping).
+
+       Available in Postfix 3.3 and later:
+
+       <b>service_name (read-only)</b>
+              The <a href="master.5.html">master.cf</a> service name of a Postfix daemon process,  or  the
+              process name of a non-daemon process.
 
 <b>FILES</b>
        /etc/postfix/canonical*, canonical mapping table
index 0a7a36ce72691593662733f29267448e829955a8..3c8da1e53c663cfd0f388ba051f026270d6386b9 100644 (file)
@@ -148,6 +148,12 @@ BOUNCE(8)                                                            BOUNCE(8)
               Detect  that  a message requires SMTPUTF8 support for the speci-
               fied mail origin classes.
 
+       Available in Postfix 3.3 and later:
+
+       <b>service_name (read-only)</b>
+              The <a href="master.5.html">master.cf</a> service name of a Postfix daemon process,  or  the
+              process name of a non-daemon process.
+
 <b>FILES</b>
        /var/spool/postfix/bounce/* non-delivery records
        /var/spool/postfix/defer/* non-delivery records
index 860465287d5feda0ad487757f1b28e4f2869abc9..ff9a16be62d95eb1b72cee0c634e9ce4e5fedc86 100644 (file)
@@ -93,6 +93,12 @@ DISCARD(8)                                                          DISCARD(8)
               A prefix that  is  prepended  to  the  process  name  in  syslog
               records, so that, for example, "smtpd" becomes "prefix/smtpd".
 
+       Available in Postfix 3.3 and later:
+
+       <b>service_name (read-only)</b>
+              The  <a href="master.5.html">master.cf</a>  service name of a Postfix daemon process, or the
+              process name of a non-daemon process.
+
 <b>SEE ALSO</b>
        <a href="qmgr.8.html">qmgr(8)</a>, queue manager
        <a href="bounce.8.html">bounce(8)</a>, delivery status reports
index b4ad67efe0624b5dbbd37f7a93b8f779c2ef5e36..cbd1064daded40f94d1b328d31655f3a30dd6eaa 100644 (file)
@@ -71,6 +71,12 @@ DNSBLOG(8)                                                          DNSBLOG(8)
               A prefix that  is  prepended  to  the  process  name  in  syslog
               records, so that, for example, "smtpd" becomes "prefix/smtpd".
 
+       Available in Postfix 3.3 and later:
+
+       <b>service_name (read-only)</b>
+              The  <a href="master.5.html">master.cf</a>  service name of a Postfix daemon process, or the
+              process name of a non-daemon process.
+
 <b>SEE ALSO</b>
        <a href="smtpd.8.html">smtpd(8)</a>, Postfix SMTP server
        <a href="postconf.5.html">postconf(5)</a>, configuration parameters
index 40ff26441321c2b6c2788fdb93e14dae96d7cff9..9a2243fa046ab07c3c2f07a3192a96dc0c0b8038 100644 (file)
@@ -106,6 +106,12 @@ ERROR(8)                                                              ERROR(8)
               A  prefix  that  is  prepended  to  the  process  name in syslog
               records, so that, for example, "smtpd" becomes "prefix/smtpd".
 
+       Available in Postfix 3.3 and later:
+
+       <b>service_name (read-only)</b>
+              The <a href="master.5.html">master.cf</a> service name of a Postfix daemon process,  or  the
+              process name of a non-daemon process.
+
 <b>SEE ALSO</b>
        <a href="qmgr.8.html">qmgr(8)</a>, queue manager
        <a href="bounce.8.html">bounce(8)</a>, delivery status reports
index cda6a6a2ee1a5fbc1581b6e1745ad3b0185b5be7..7a5a26bec6f7bac1339a4d071a1684cde4cec1ba 100644 (file)
@@ -138,6 +138,12 @@ FLUSH(8)                                                              FLUSH(8)
               A prefix that  is  prepended  to  the  process  name  in  syslog
               records, so that, for example, "smtpd" becomes "prefix/smtpd".
 
+       Available in Postfix 3.3 and later:
+
+       <b>service_name (read-only)</b>
+              The  <a href="master.5.html">master.cf</a>  service name of a Postfix daemon process, or the
+              process name of a non-daemon process.
+
 <b>FILES</b>
        /var/spool/postfix/flush, "fast flush" logfiles.
 
index 2dd0d2bfd926c0b2e7886a3264b0609b2d702192..68ab8d2b535747d74568362e247e04a34359366b 100644 (file)
@@ -879,6 +879,12 @@ SMTP(8)                                                                SMTP(8)
        <b><a href="postconf.5.html#smtp_tcp_port">smtp_tcp_port</a> (smtp)</b>
               The default TCP port that the Postfix SMTP client connects to.
 
+       Available in Postfix 3.3 and later:
+
+       <b>service_name (read-only)</b>
+              The <a href="master.5.html">master.cf</a> service name of a Postfix daemon process,  or  the
+              process name of a non-daemon process.
+
 <b>SEE ALSO</b>
        <a href="generic.5.html">generic(5)</a>, output address rewriting
        <a href="header_checks.5.html">header_checks(5)</a>, message header content inspection
index ceec09222f96ffee10ec8f2cf7b48767e5f9d1d8..d7be72e33771a1da6e43d173fbf572759e771c8d 100644 (file)
@@ -327,14 +327,15 @@ LOCAL(8)                                                              LOCAL(8)
               Whether or not to use the local <a href="postconf.5.html#biff">biff</a> service.
 
        <b><a href="postconf.5.html#expand_owner_alias">expand_owner_alias</a> (no)</b>
-              When   delivering   to   an   alias   "aliasname"  that  has  an
-              "owner-aliasname"  companion  alias,  set  the  envelope  sender
-              address to the expansion of the "owner-aliasname" alias.
+              When   delivering   to   an   alias   "<i>aliasname</i>"  that  has  an
+              "owner-<i>aliasname</i>"  companion  alias,  set  the  envelope  sender
+              address to the expansion of the "owner-<i>aliasname</i>" alias.
 
        <b><a href="postconf.5.html#owner_request_special">owner_request_special</a> (yes)</b>
-              Give  special  treatment  to owner-listname and listname-request
-              address localparts: don't split such addresses when the  <a href="postconf.5.html#recipient_delimiter">recipi</a>-
-              <a href="postconf.5.html#recipient_delimiter">ent_delimiter</a> is set to "-".
+              Enable  special  treatment  for  owner-<i>listname</i>  entries  in the
+              <a href="aliases.5.html"><b>aliases</b>(5)</a>  file,  and  don't  split  owner-<i>listname</i>  and  <i>list-</i>
+              <i>name</i>-request  address localparts when the <a href="postconf.5.html#recipient_delimiter">recipient_delimiter</a> is
+              set to "-".
 
        <b><a href="postconf.5.html#sun_mailtool_compatibility">sun_mailtool_compatibility</a> (no)</b>
               Obsolete SUN mailtool compatibility feature.
@@ -342,62 +343,62 @@ LOCAL(8)                                                              LOCAL(8)
        Available in Postfix version 2.3 and later:
 
        <b><a href="postconf.5.html#frozen_delivered_to">frozen_delivered_to</a> (yes)</b>
-              Update  the  <a href="local.8.html"><b>local</b>(8)</a> delivery agent's idea of the Delivered-To:
-              address (see <a href="postconf.5.html#prepend_delivered_header">prepend_delivered_header</a>) only once, at  the  start
-              of  a  delivery attempt; do not update the Delivered-To: address
+              Update the <a href="local.8.html"><b>local</b>(8)</a> delivery agent's idea of  the  Delivered-To:
+              address  (see  <a href="postconf.5.html#prepend_delivered_header">prepend_delivered_header</a>) only once, at the start
+              of a delivery attempt; do not update the  Delivered-To:  address
               while expanding aliases or .forward files.
 
        Available in Postfix version 2.5.3 and later:
 
        <b><a href="postconf.5.html#strict_mailbox_ownership">strict_mailbox_ownership</a> (yes)</b>
-              Defer delivery when a mailbox file is not owned by  its  recipi-
+              Defer  delivery  when a mailbox file is not owned by its recipi-
               ent.
 
        <b><a href="postconf.5.html#reset_owner_alias">reset_owner_alias</a> (no)</b>
-              Reset  the  <a href="local.8.html"><b>local</b>(8)</a>  delivery  agent's  idea of the owner-alias
-              attribute, when delivering mail to a child alias that  does  not
+              Reset the <a href="local.8.html"><b>local</b>(8)</a> delivery  agent's  idea  of  the  owner-alias
+              attribute,  when  delivering mail to a child alias that does not
               have its own owner alias.
 
        Available in Postfix version 3.0 and later:
 
        <b><a href="postconf.5.html#local_delivery_status_filter">local_delivery_status_filter</a> ($<a href="postconf.5.html#default_delivery_status_filter">default_delivery_status_filter</a>)</b>
-              Optional  filter  for  the <a href="local.8.html"><b>local</b>(8)</a> delivery agent to change the
-              status code or explanatory text of  successful  or  unsuccessful
+              Optional filter for the <a href="local.8.html"><b>local</b>(8)</a> delivery agent  to  change  the
+              status  code  or  explanatory text of successful or unsuccessful
               deliveries.
 
 <b>DELIVERY METHOD CONTROLS</b>
-       The  precedence  of  <a href="local.8.html"><b>local</b>(8)</a>  delivery  methods  from  high to low is:
+       The precedence of <a href="local.8.html"><b>local</b>(8)</a>  delivery  methods  from  high  to  low  is:
        aliases,  .forward  files,  <a href="postconf.5.html#mailbox_transport_maps">mailbox_transport_maps</a>,  <a href="postconf.5.html#mailbox_transport">mailbox_transport</a>,
-       <a href="postconf.5.html#mailbox_command_maps">mailbox_command_maps</a>,  <a href="postconf.5.html#mailbox_command">mailbox_command</a>, <a href="postconf.5.html#home_mailbox">home_mailbox</a>, <a href="postconf.5.html#mail_spool_directory">mail_spool_direc</a>-
+       <a href="postconf.5.html#mailbox_command_maps">mailbox_command_maps</a>, <a href="postconf.5.html#mailbox_command">mailbox_command</a>, <a href="postconf.5.html#home_mailbox">home_mailbox</a>,  <a href="postconf.5.html#mail_spool_directory">mail_spool_direc</a>-
        <a href="postconf.5.html#mail_spool_directory">tory</a>, <a href="postconf.5.html#fallback_transport_maps">fallback_transport_maps</a>, <a href="postconf.5.html#fallback_transport">fallback_transport</a>, and <a href="postconf.5.html#luser_relay">luser_relay</a>.
 
        <b><a href="postconf.5.html#alias_maps">alias_maps</a> (see 'postconf -d' output)</b>
               The alias databases that are used for <a href="local.8.html"><b>local</b>(8)</a> delivery.
 
        <b><a href="postconf.5.html#forward_path">forward_path</a> (see 'postconf -d' output)</b>
-              The <a href="local.8.html"><b>local</b>(8)</a> delivery agent search list for finding  a  .forward
+              The  <a href="local.8.html"><b>local</b>(8)</a>  delivery agent search list for finding a .forward
               file with user-specified delivery methods.
 
        <b><a href="postconf.5.html#mailbox_transport_maps">mailbox_transport_maps</a> (empty)</b>
               Optional  lookup  tables  with  per-recipient  message  delivery
-              transports to use for <a href="local.8.html"><b>local</b>(8)</a> mailbox delivery, whether or  not
+              transports  to use for <a href="local.8.html"><b>local</b>(8)</a> mailbox delivery, whether or not
               the recipients are found in the UNIX passwd database.
 
        <b><a href="postconf.5.html#mailbox_transport">mailbox_transport</a> (empty)</b>
-              Optional  message  delivery transport that the <a href="local.8.html"><b>local</b>(8)</a> delivery
-              agent should use for mailbox delivery to all  local  recipients,
+              Optional message delivery transport that the  <a href="local.8.html"><b>local</b>(8)</a>  delivery
+              agent  should  use for mailbox delivery to all local recipients,
               whether or not they are found in the UNIX passwd database.
 
        <b><a href="postconf.5.html#mailbox_command_maps">mailbox_command_maps</a> (empty)</b>
-              Optional  lookup  tables with per-recipient external commands to
+              Optional lookup tables with per-recipient external  commands  to
               use for <a href="local.8.html"><b>local</b>(8)</a> mailbox delivery.
 
        <b><a href="postconf.5.html#mailbox_command">mailbox_command</a> (empty)</b>
-              Optional external  command  that  the  <a href="local.8.html"><b>local</b>(8)</a>  delivery  agent
+              Optional  external  command  that  the  <a href="local.8.html"><b>local</b>(8)</a>  delivery agent
               should use for mailbox delivery.
 
        <b><a href="postconf.5.html#home_mailbox">home_mailbox</a> (empty)</b>
-              Optional  pathname  of  a  mailbox  file  relative to a <a href="local.8.html"><b>local</b>(8)</a>
+              Optional pathname of a  mailbox  file  relative  to  a  <a href="local.8.html"><b>local</b>(8)</a>
               user's home directory.
 
        <b><a href="postconf.5.html#mail_spool_directory">mail_spool_directory</a> (see 'postconf -d' output)</b>
@@ -409,17 +410,17 @@ LOCAL(8)                                                              LOCAL(8)
               not find in the <a href="aliases.5.html"><b>aliases</b>(5)</a> or UNIX password database.
 
        <b><a href="postconf.5.html#fallback_transport">fallback_transport</a> (empty)</b>
-              Optional message delivery transport that the  <a href="local.8.html"><b>local</b>(8)</a>  delivery
-              agent  should use for names that are not found in the <a href="aliases.5.html"><b>aliases</b>(5)</a>
+              Optional  message  delivery transport that the <a href="local.8.html"><b>local</b>(8)</a> delivery
+              agent should use for names that are not found in the  <a href="aliases.5.html"><b>aliases</b>(5)</a>
               or UNIX password database.
 
        <b><a href="postconf.5.html#luser_relay">luser_relay</a> (empty)</b>
-              Optional catch-all destination for unknown <a href="local.8.html"><b>local</b>(8)</a>  recipients.
+              Optional  catch-all destination for unknown <a href="local.8.html"><b>local</b>(8)</a> recipients.
 
        Available in Postfix version 2.2 and later:
 
        <b><a href="postconf.5.html#command_execution_directory">command_execution_directory</a> (empty)</b>
-              The  <a href="local.8.html"><b>local</b>(8)</a>  delivery  agent working directory for delivery to
+              The <a href="local.8.html"><b>local</b>(8)</a> delivery agent working directory  for  delivery  to
               external command.
 
 <b>MAILBOX LOCKING CONTROLS</b>
@@ -428,15 +429,15 @@ LOCAL(8)                                                              LOCAL(8)
               mailbox file or <a href="bounce.8.html"><b>bounce</b>(8)</a> logfile.
 
        <b><a href="postconf.5.html#deliver_lock_delay">deliver_lock_delay</a> (1s)</b>
-              The  time  between  attempts  to  acquire an exclusive lock on a
+              The time between attempts to acquire  an  exclusive  lock  on  a
               mailbox file or <a href="bounce.8.html"><b>bounce</b>(8)</a> logfile.
 
        <b><a href="postconf.5.html#stale_lock_time">stale_lock_time</a> (500s)</b>
-              The time after which  a  stale  exclusive  mailbox  lockfile  is
+              The  time  after  which  a  stale  exclusive mailbox lockfile is
               removed.
 
        <b><a href="postconf.5.html#mailbox_delivery_lock">mailbox_delivery_lock</a> (see 'postconf -d' output)</b>
-              How  to  lock  a  UNIX-style  <a href="local.8.html"><b>local</b>(8)</a> mailbox before attempting
+              How to lock a  UNIX-style  <a href="local.8.html"><b>local</b>(8)</a>  mailbox  before  attempting
               delivery.
 
 <b>RESOURCE AND RATE CONTROLS</b>
@@ -449,20 +450,20 @@ LOCAL(8)                                                              LOCAL(8)
               <a href="showq.8.html"><b>showq</b>(8)</a> queue displays.
 
        <b><a href="postconf.5.html#mailbox_size_limit">mailbox_size_limit</a> (51200000)</b>
-              The maximal size of any <a href="local.8.html"><b>local</b>(8)</a> individual mailbox  or  maildir
+              The  maximal  size of any <a href="local.8.html"><b>local</b>(8)</a> individual mailbox or maildir
               file, or zero (no limit).
 
        Implemented in the <a href="qmgr.8.html">qmgr(8)</a> daemon:
 
        <b><a href="postconf.5.html#local_destination_concurrency_limit">local_destination_concurrency_limit</a> (2)</b>
-              The  maximal  number  of  parallel deliveries via the local mail
-              delivery transport to the same recipient  (when  "<a href="postconf.5.html#local_destination_recipient_limit">local_destina</a>-
-              <a href="postconf.5.html#local_destination_recipient_limit">tion_recipient_limit</a>  =  1")  or  the maximal number of parallel
+              The maximal number of parallel deliveries  via  the  local  mail
+              delivery  transport  to the same recipient (when "<a href="postconf.5.html#local_destination_recipient_limit">local_destina</a>-
+              <a href="postconf.5.html#local_destination_recipient_limit">tion_recipient_limit</a> = 1") or the  maximal  number  of  parallel
               deliveries  to  the  same  local  domain  (when  "<a href="postconf.5.html#local_destination_recipient_limit">local_destina</a>-
               <a href="postconf.5.html#local_destination_recipient_limit">tion_recipient_limit</a> &gt; 1").
 
        <b><a href="postconf.5.html#local_destination_recipient_limit">local_destination_recipient_limit</a> (1)</b>
-              The  maximal  number  of recipients per message delivery via the
+              The maximal number of recipients per message  delivery  via  the
               local mail delivery transport.
 
 <b>SECURITY CONTROLS</b>
@@ -473,49 +474,49 @@ LOCAL(8)                                                              LOCAL(8)
               Restrict <a href="local.8.html"><b>local</b>(8)</a> mail delivery to external files.
 
        <b><a href="postconf.5.html#command_expansion_filter">command_expansion_filter</a> (see 'postconf -d' output)</b>
-              Restrict the characters that the <a href="local.8.html"><b>local</b>(8)</a> delivery agent  allows
-              in  $name  expansions  of  $<a href="postconf.5.html#mailbox_command">mailbox_command</a>  and $<a href="postconf.5.html#command_execution_directory">command_execu</a>-
+              Restrict  the characters that the <a href="local.8.html"><b>local</b>(8)</a> delivery agent allows
+              in $name  expansions  of  $<a href="postconf.5.html#mailbox_command">mailbox_command</a>  and  $<a href="postconf.5.html#command_execution_directory">command_execu</a>-
               <a href="postconf.5.html#command_execution_directory">tion_directory</a>.
 
        <b><a href="postconf.5.html#default_privs">default_privs</a> (nobody)</b>
-              The default rights used  by  the  <a href="local.8.html"><b>local</b>(8)</a>  delivery  agent  for
+              The  default  rights  used  by  the  <a href="local.8.html"><b>local</b>(8)</a> delivery agent for
               delivery to external file or command.
 
        <b><a href="postconf.5.html#forward_expansion_filter">forward_expansion_filter</a> (see 'postconf -d' output)</b>
-              Restrict  the characters that the <a href="local.8.html"><b>local</b>(8)</a> delivery agent allows
+              Restrict the characters that the <a href="local.8.html"><b>local</b>(8)</a> delivery agent  allows
               in $name expansions of $<a href="postconf.5.html#forward_path">forward_path</a>.
 
        Available in Postfix version 2.2 and later:
 
        <b><a href="postconf.5.html#execution_directory_expansion_filter">execution_directory_expansion_filter</a> (see 'postconf -d' output)</b>
-              Restrict the characters that the <a href="local.8.html"><b>local</b>(8)</a> delivery agent  allows
+              Restrict  the characters that the <a href="local.8.html"><b>local</b>(8)</a> delivery agent allows
               in $name expansions of $<a href="postconf.5.html#command_execution_directory">command_execution_directory</a>.
 
        Available in Postfix version 2.5.3 and later:
 
        <b><a href="postconf.5.html#strict_mailbox_ownership">strict_mailbox_ownership</a> (yes)</b>
-              Defer  delivery  when a mailbox file is not owned by its recipi-
+              Defer delivery when a mailbox file is not owned by  its  recipi-
               ent.
 
 <b>MISCELLANEOUS CONTROLS</b>
        <b><a href="postconf.5.html#config_directory">config_directory</a> (see 'postconf -d' output)</b>
-              The default location of the Postfix <a href="postconf.5.html">main.cf</a> and  <a href="master.5.html">master.cf</a>  con-
+              The  default  location of the Postfix <a href="postconf.5.html">main.cf</a> and <a href="master.5.html">master.cf</a> con-
               figuration files.
 
        <b><a href="postconf.5.html#daemon_timeout">daemon_timeout</a> (18000s)</b>
-              How  much  time  a  Postfix  daemon process may take to handle a
+              How much time a Postfix daemon process  may  take  to  handle  a
               request before it is terminated by a built-in watchdog timer.
 
        <b><a href="postconf.5.html#delay_logging_resolution_limit">delay_logging_resolution_limit</a> (2)</b>
-              The maximal number of digits after the decimal point  when  log-
+              The  maximal  number of digits after the decimal point when log-
               ging sub-second delay values.
 
        <b><a href="postconf.5.html#export_environment">export_environment</a> (see 'postconf -d' output)</b>
-              The  list  of  environment variables that a Postfix process will
+              The list of environment variables that a  Postfix  process  will
               export to non-Postfix processes.
 
        <b><a href="postconf.5.html#ipc_timeout">ipc_timeout</a> (3600s)</b>
-              The time limit for sending  or  receiving  information  over  an
+              The  time  limit  for  sending  or receiving information over an
               internal communication channel.
 
        <b><a href="postconf.5.html#local_command_shell">local_command_shell</a> (empty)</b>
@@ -523,7 +524,7 @@ LOCAL(8)                                                              LOCAL(8)
               mand.
 
        <b><a href="postconf.5.html#max_idle">max_idle</a> (100s)</b>
-              The maximum amount of time that an idle Postfix  daemon  process
+              The  maximum  amount of time that an idle Postfix daemon process
               waits for an incoming connection before terminating voluntarily.
 
        <b><a href="postconf.5.html#max_use">max_use</a> (100)</b>
@@ -531,8 +532,8 @@ LOCAL(8)                                                              LOCAL(8)
               process will service before terminating voluntarily.
 
        <b><a href="postconf.5.html#prepend_delivered_header">prepend_delivered_header</a> (command, file, forward)</b>
-              The  message delivery contexts where the Postfix <a href="local.8.html"><b>local</b>(8)</a> deliv-
-              ery agent prepends a  Delivered-To:   message  header  with  the
+              The message delivery contexts where the Postfix <a href="local.8.html"><b>local</b>(8)</a>  deliv-
+              ery  agent  prepends  a  Delivered-To:   message header with the
               address that the mail was delivered to.
 
        <b><a href="postconf.5.html#process_id">process_id</a> (read-only)</b>
@@ -542,15 +543,15 @@ LOCAL(8)                                                              LOCAL(8)
               The process name of a Postfix command or daemon process.
 
        <b><a href="postconf.5.html#propagate_unmatched_extensions">propagate_unmatched_extensions</a> (canonical, virtual)</b>
-              What  address  lookup  tables copy an address extension from the
+              What address lookup tables copy an address  extension  from  the
               lookup key to the lookup result.
 
        <b><a href="postconf.5.html#queue_directory">queue_directory</a> (see 'postconf -d' output)</b>
               The location of the Postfix top-level queue directory.
 
        <b><a href="postconf.5.html#recipient_delimiter">recipient_delimiter</a> (empty)</b>
-              The set of characters that can separate a  user  name  from  its
-              extension  (example: user+foo), or a .forward file name from its
+              The  set  of  characters  that can separate a user name from its
+              extension (example: user+foo), or a .forward file name from  its
               extension (example: .forward+foo).
 
        <b><a href="postconf.5.html#require_home_directory">require_home_directory</a> (no)</b>
@@ -561,16 +562,20 @@ LOCAL(8)                                                              LOCAL(8)
               The syslog facility of Postfix logging.
 
        <b><a href="postconf.5.html#syslog_name">syslog_name</a> (see 'postconf -d' output)</b>
-              A  prefix  that  is  prepended  to  the  process  name in syslog
+              A prefix that  is  prepended  to  the  process  name  in  syslog
               records, so that, for example, "smtpd" becomes "prefix/smtpd".
 
        Available in Postfix version 3.3 and later:
 
        <b><a href="postconf.5.html#enable_original_recipient">enable_original_recipient</a> (yes)</b>
-              Enable support for  the  original  recipient  address  after  an
-              address  is  rewritten  to a different address (for example with
+              Enable  support  for  the  original  recipient  address after an
+              address is rewritten to a different address  (for  example  with
               aliasing or with canonical mapping).
 
+       <b>service_name (read-only)</b>
+              The  <a href="master.5.html">master.cf</a>  service name of a Postfix daemon process, or the
+              process name of a non-daemon process.
+
 <b>FILES</b>
        The following are examples; details differ between systems.
        $HOME/.forward, per-user aliasing
index 6945e059f9d2059bfa1ef6079618640e469b895e..47bf1e01d1e601ab631b0ae1db4ffb13f1e66775 100644 (file)
@@ -143,11 +143,12 @@ MASTER(8)                                                            MASTER(8)
               or accepting connections.
 
        <b><a href="postconf.5.html#import_environment">import_environment</a> (see 'postconf -d' output)</b>
-              The list of environment parameters that a Postfix  process  will
-              import from a non-Postfix parent process.
+              The list of environment parameters  that  a  privileged  Postfix
+              process  will  import  from  a  non-Postfix  parent  process, or
+              name=value environment overrides.
 
        <b><a href="postconf.5.html#mail_owner">mail_owner</a> (postfix)</b>
-              The  UNIX  system  account  that owns the Postfix queue and most
+              The UNIX system account that owns the  Postfix  queue  and  most
               Postfix daemon processes.
 
        <b><a href="postconf.5.html#process_id">process_id</a> (read-only)</b>
@@ -163,9 +164,15 @@ MASTER(8)                                                            MASTER(8)
               The syslog facility of Postfix logging.
 
        <b><a href="postconf.5.html#syslog_name">syslog_name</a> (see 'postconf -d' output)</b>
-              A prefix that  is  prepended  to  the  process  name  in  syslog
+              A  prefix  that  is  prepended  to  the  process  name in syslog
               records, so that, for example, "smtpd" becomes "prefix/smtpd".
 
+       Available in Postfix 3.3 and later:
+
+       <b>service_name (read-only)</b>
+              The <a href="master.5.html">master.cf</a> service name of a Postfix daemon process,  or  the
+              process name of a non-daemon process.
+
 <b>FILES</b>
        To  expand  the directory names below into their actual values, use the
        command "<b>postconf <a href="postconf.5.html#config_directory">config_directory</a></b>" etc.
index eb35e3ac97c962f8ca901abc99f357ce832c3848..b0ef89c971609fea6e5c829d0017b53a86ef228e 100644 (file)
@@ -376,6 +376,12 @@ OQMGR(8)                                                              OQMGR(8)
               After  sending  a "your message is delayed" notification, inform
               the sender when the delay clears up.
 
+       Available in Postfix 3.3 and later:
+
+       <b>service_name (read-only)</b>
+              The <a href="master.5.html">master.cf</a> service name of a Postfix daemon process,  or  the
+              process name of a non-daemon process.
+
 <b>FILES</b>
        /var/spool/postfix/incoming, <a href="QSHAPE_README.html#incoming_queue">incoming queue</a>
        /var/spool/postfix/active, <a href="QSHAPE_README.html#active_queue">active queue</a>
index 59ae1707a45a2188a2a9773e04da4a76c3fd9c93..cbb8cc68c8386a33266fae7fee6763117f9493bd 100644 (file)
@@ -92,6 +92,12 @@ PICKUP(8)                                                            PICKUP(8)
               A  prefix  that  is  prepended  to  the  process  name in syslog
               records, so that, for example, "smtpd" becomes "prefix/smtpd".
 
+       Available in Postfix 3.3 and later:
+
+       <b>service_name (read-only)</b>
+              The <a href="master.5.html">master.cf</a> service name of a Postfix daemon process,  or  the
+              process name of a non-daemon process.
+
 <b>SEE ALSO</b>
        <a href="cleanup.8.html">cleanup(8)</a>, message canonicalization
        <a href="sendmail.1.html">sendmail(1)</a>, Sendmail-compatible interface
index 0c8dcf1ec594869f83668e5d18b516a355cb4447..4aef6c17fbca9dd5d9d6320234bdcbc76c7e247f 100644 (file)
@@ -468,6 +468,10 @@ PIPE(8)                                                                PIPE(8)
               address  is  rewritten  to a different address (for example with
               aliasing or with canonical mapping).
 
+       <b>service_name (read-only)</b>
+              The <a href="master.5.html">master.cf</a> service name of a Postfix daemon process,  or  the
+              process name of a non-daemon process.
+
 <b>SEE ALSO</b>
        <a href="qmgr.8.html">qmgr(8)</a>, queue manager
        <a href="bounce.8.html">bounce(8)</a>, delivery status reports
index 5a6b8eb0e23db72bc78a2df54601445a2a2ef1a5..f0e034f9d56f08a6b2ceb99c5468e37ff0a3ffae 100644 (file)
@@ -10035,6 +10035,17 @@ submit mail into the Postfix queue.
 </p>
 
 
+</DD>
+
+<DT><b><a name="service_name">service_name</a>
+(read-only)</b></DT><DD>
+
+<p>
+The <a href="master.5.html">master.cf</a> service name of a Postfix daemon process, or the
+process name of a non-daemon process.
+</p>
+
+
 </DD>
 
 <DT><b><a name="service_throttle_time">service_throttle_time</a>
index 71802ff8426ce34b8a0ae596fdeb57318d643cfa..d41e03d1c02ee8d7ee81a7bbe731ce9fd1760378 100644 (file)
@@ -397,6 +397,12 @@ POSTSCREEN(8)                                                    POSTSCREEN(8)
               A  prefix  that  is  prepended  to  the  process  name in syslog
               records, so that, for example, "smtpd" becomes "prefix/smtpd".
 
+       Available in Postfix 3.3 and later:
+
+       <b>service_name (read-only)</b>
+              The <a href="master.5.html">master.cf</a> service name of a Postfix daemon process,  or  the
+              process name of a non-daemon process.
+
 <b>SEE ALSO</b>
        <a href="smtpd.8.html">smtpd(8)</a>, Postfix SMTP server
        <a href="tlsproxy.8.html">tlsproxy(8)</a>, Postfix TLS proxy server
@@ -412,7 +418,7 @@ POSTSCREEN(8)                                                    POSTSCREEN(8)
 <b>HISTORY</b>
        This service was introduced with Postfix version 2.8.
 
-       Many  ideas  in  <a href="postscreen.8.html"><b>postscreen</b>(8)</a> were explored in earlier work by Michael
+       Many ideas in <a href="postscreen.8.html"><b>postscreen</b>(8)</a> were explored in earlier  work  by  Michael
        Tokarev, in OpenBSD spamd, and in MailChannels Traffic Control.
 
 <b>AUTHOR(S)</b>
index 488a60550b37034d14a71b66100e4b0709a58826..158f301971445bd3a9d175d3ea029e111552949c 100644 (file)
@@ -189,6 +189,12 @@ PROXYMAP(8)                                                        PROXYMAP(8)
               The lookup tables that the  <a href="proxymap.8.html"><b>proxymap</b>(8)</a>  server  is  allowed  to
               access for the read-write service.
 
+       Available in Postfix 3.3 and later:
+
+       <b>service_name (read-only)</b>
+              The  <a href="master.5.html">master.cf</a>  service name of a Postfix daemon process, or the
+              process name of a non-daemon process.
+
 <b>SEE ALSO</b>
        <a href="postconf.5.html">postconf(5)</a>, configuration parameters
        <a href="master.5.html">master(5)</a>, generic daemon options
index 8d68a440a9e56ef6ad9735d561636649a87b21eb..a6ab0654c096dffbbbf956445396fa0298d35519 100644 (file)
@@ -453,6 +453,12 @@ QMGR(8)                                                                QMGR(8)
               After sending a "your message is delayed"  notification,  inform
               the sender when the delay clears up.
 
+       Available in Postfix 3.3 and later:
+
+       <b>service_name (read-only)</b>
+              The  <a href="master.5.html">master.cf</a>  service name of a Postfix daemon process, or the
+              process name of a non-daemon process.
+
 <b>FILES</b>
        /var/spool/postfix/incoming, <a href="QSHAPE_README.html#incoming_queue">incoming queue</a>
        /var/spool/postfix/active, <a href="QSHAPE_README.html#active_queue">active queue</a>
index 06811bdfcf28d76eb146a847a5c8064ac2b1d348..0fc684e87d31b7bcfcde6776805b4d1aa29bbeb2 100644 (file)
@@ -160,6 +160,12 @@ QMQPD(8)                                                              QMQPD(8)
               Enable logging of the remote QMQP client port in addition to the
               hostname and IP address.
 
+       Available in Postfix 3.3 and later:
+
+       <b>service_name (read-only)</b>
+              The  <a href="master.5.html">master.cf</a>  service name of a Postfix daemon process, or the
+              process name of a non-daemon process.
+
 <b>SEE ALSO</b>
        <a href="http://cr.yp.to/proto/qmqp.html">http://cr.yp.to/proto/qmqp.html</a>, QMQP protocol
        <a href="cleanup.8.html">cleanup(8)</a>, message canonicalization
index 00f71833fe6b136b008c25558fa7feeb9bbb8fa8..4b8e5976be0f33e52fe6c1a82818c8ee7add2a72 100644 (file)
@@ -129,6 +129,12 @@ SCACHE(8)                                                            SCACHE(8)
               A  prefix  that  is  prepended  to  the  process  name in syslog
               records, so that, for example, "smtpd" becomes "prefix/smtpd".
 
+       Available in Postfix 3.3 and later:
+
+       <b>service_name (read-only)</b>
+              The <a href="master.5.html">master.cf</a> service name of a Postfix daemon process,  or  the
+              process name of a non-daemon process.
+
 <b>SEE ALSO</b>
        <a href="smtp.8.html">smtp(8)</a>, SMTP client
        <a href="postconf.5.html">postconf(5)</a>, configuration parameters
index 20f58f172012e1d2e716e95ab4951c3b364a12d1..a0c3534f44a08dc2901c152f9eb98560ec95dfc2 100644 (file)
@@ -90,6 +90,12 @@ SHOWQ(8)                                                              SHOWQ(8)
        <b><a href="postconf.5.html#enable_long_queue_ids">enable_long_queue_ids</a> (no)</b>
               Enable long, non-repeating, queue IDs (queue file names).
 
+       Available in Postfix 3.3 and later:
+
+       <b>service_name (read-only)</b>
+              The <a href="master.5.html">master.cf</a> service name of a Postfix daemon process,  or  the
+              process name of a non-daemon process.
+
 <b>FILES</b>
        /var/spool/postfix, queue directories
 
index 2dd0d2bfd926c0b2e7886a3264b0609b2d702192..68ab8d2b535747d74568362e247e04a34359366b 100644 (file)
@@ -879,6 +879,12 @@ SMTP(8)                                                                SMTP(8)
        <b><a href="postconf.5.html#smtp_tcp_port">smtp_tcp_port</a> (smtp)</b>
               The default TCP port that the Postfix SMTP client connects to.
 
+       Available in Postfix 3.3 and later:
+
+       <b>service_name (read-only)</b>
+              The <a href="master.5.html">master.cf</a> service name of a Postfix daemon process,  or  the
+              process name of a non-daemon process.
+
 <b>SEE ALSO</b>
        <a href="generic.5.html">generic(5)</a>, output address rewriting
        <a href="header_checks.5.html">header_checks(5)</a>, message header content inspection
index 2e52d32918283edfe6eaa9ec9648604192b6e5d6..527d0873b392a2e50821294383af67c28fd1eae9 100644 (file)
@@ -1279,6 +1279,12 @@ SMTPD(8)                                                              SMTPD(8)
               Enable logging of the remote SMTP client port in addition to the
               hostname and IP address.
 
+       Available in Postfix 3.3 and later:
+
+       <b>service_name (read-only)</b>
+              The  <a href="master.5.html">master.cf</a>  service name of a Postfix daemon process, or the
+              process name of a non-daemon process.
+
 <b>SEE ALSO</b>
        <a href="anvil.8.html">anvil(8)</a>, connection/rate limiting
        <a href="cleanup.8.html">cleanup(8)</a>, message canonicalization
index 0851aaa0283c0ffef3a6dd0caa8eedb103705206..77a54ad31a97fc13c2cd96ce985d8292edd83909 100644 (file)
@@ -121,6 +121,12 @@ SPAWN(8)                                                              SPAWN(8)
               A  prefix  that  is  prepended  to  the  process  name in syslog
               records, so that, for example, "smtpd" becomes "prefix/smtpd".
 
+       Available in Postfix 3.3 and later:
+
+       <b>service_name (read-only)</b>
+              The <a href="master.5.html">master.cf</a> service name of a Postfix daemon process,  or  the
+              process name of a non-daemon process.
+
 <b>SEE ALSO</b>
        <a href="postconf.5.html">postconf(5)</a>, configuration parameters
        <a href="master.8.html">master(8)</a>, process manager
index ced9f6c2948e63b183f0a7340dd065ab2c517449..54cfa36095a254bc0268596c1304a86b7eee7561 100644 (file)
@@ -149,6 +149,12 @@ TLSMGR(8)                                                            TLSMGR(8)
               A prefix that  is  prepended  to  the  process  name  in  syslog
               records, so that, for example, "smtpd" becomes "prefix/smtpd".
 
+       Available in Postfix 3.3 and later:
+
+       <b>service_name (read-only)</b>
+              The  <a href="master.5.html">master.cf</a>  service name of a Postfix daemon process, or the
+              process name of a non-daemon process.
+
 <b>SEE ALSO</b>
        <a href="smtp.8.html">smtp(8)</a>, Postfix SMTP client
        <a href="smtpd.8.html">smtpd(8)</a>, Postfix SMTP server
index 54c6a3e9ed7a830d63e7c138acd479c3d20b4d56..15e8cab78ad5d65722c428015ecfa3f72a8a8537 100644 (file)
@@ -194,6 +194,12 @@ TLSPROXY(8)                                                        TLSPROXY(8)
               A  prefix  that  is  prepended  to  the  process  name in syslog
               records, so that, for example, "smtpd" becomes "prefix/smtpd".
 
+       Available in Postfix 3.3 and later:
+
+       <b>service_name (read-only)</b>
+              The <a href="master.5.html">master.cf</a> service name of a Postfix daemon process,  or  the
+              process name of a non-daemon process.
+
 <b>SEE ALSO</b>
        <a href="postscreen.8.html">postscreen(8)</a>, Postfix zombie blocker
        <a href="smtpd.8.html">smtpd(8)</a>, Postfix SMTP server
index 0a7a36ce72691593662733f29267448e829955a8..3c8da1e53c663cfd0f388ba051f026270d6386b9 100644 (file)
@@ -148,6 +148,12 @@ BOUNCE(8)                                                            BOUNCE(8)
               Detect  that  a message requires SMTPUTF8 support for the speci-
               fied mail origin classes.
 
+       Available in Postfix 3.3 and later:
+
+       <b>service_name (read-only)</b>
+              The <a href="master.5.html">master.cf</a> service name of a Postfix daemon process,  or  the
+              process name of a non-daemon process.
+
 <b>FILES</b>
        /var/spool/postfix/bounce/* non-delivery records
        /var/spool/postfix/defer/* non-delivery records
index 447a46dcb980cea73adb4d1b266f9b831dacda44..b0aa38bba0aeec475329730245904e3a4f7661b2 100644 (file)
@@ -298,6 +298,12 @@ TRIVIAL-REWRITE(8)                                          TRIVIAL-REWRITE(8)
               Log  warnings about problematic configuration settings, and pro-
               vide helpful suggestions.
 
+       Available in Postfix 3.3 and later:
+
+       <b>service_name (read-only)</b>
+              The <a href="master.5.html">master.cf</a> service name of a Postfix daemon process,  or  the
+              process name of a non-daemon process.
+
 <b>SEE ALSO</b>
        <a href="postconf.5.html">postconf(5)</a>, configuration parameters
        <a href="transport.5.html">transport(5)</a>, transport table format
index 4f302434c94d3b0ce32341c2249e0dc7128f0a99..c2332b2f4f77f8ad98ba318989506b3d61731353 100644 (file)
@@ -205,6 +205,12 @@ VERIFY(8)                                                            VERIFY(8)
               A  prefix  that  is  prepended  to  the  process  name in syslog
               records, so that, for example, "smtpd" becomes "prefix/smtpd".
 
+       Available in Postfix 3.3 and later:
+
+       <b>service_name (read-only)</b>
+              The <a href="master.5.html">master.cf</a> service name of a Postfix daemon process,  or  the
+              process name of a non-daemon process.
+
 <b>SEE ALSO</b>
        <a href="smtpd.8.html">smtpd(8)</a>, Postfix SMTP server
        <a href="cleanup.8.html">cleanup(8)</a>, enqueue Postfix message
index 4af7d86a5cd280fc692a4a9b8e0f0db79fb7986b..737cc60f96ccfce9974f5ae5828e0a4b5eb9d25c 100644 (file)
@@ -276,6 +276,10 @@ VIRTUAL(8)                                                          VIRTUAL(8)
               address is rewritten to a different address  (for  example  with
               aliasing or with canonical mapping).
 
+       <b>service_name (read-only)</b>
+              The  <a href="master.5.html">master.cf</a>  service name of a Postfix daemon process, or the
+              process name of a non-daemon process.
+
 <b>SEE ALSO</b>
        <a href="qmgr.8.html">qmgr(8)</a>, queue manager
        <a href="bounce.8.html">bounce(8)</a>, delivery status reports
@@ -291,15 +295,15 @@ VIRTUAL(8)                                                          VIRTUAL(8)
        The Secure Mailer license must be distributed with this software.
 
 <b>HISTORY</b>
-       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 <b>Delivered-To:</b> message header appears in the <b>qmail</b> system by  Daniel
+       The  <b>Delivered-To:</b> message header appears in the <b>qmail</b> system by Daniel
        Bernstein.
 
-       The  <b>maildir</b> structure appears in the <b>qmail</b> system by Daniel Bernstein.
+       The <b>maildir</b> structure appears in the <b>qmail</b> system by Daniel  Bernstein.
 
 <b>AUTHOR(S)</b>
        Wietse Venema
index 97d8cd8af1fe04def45d607805fb06e6098dc20a..b60fcb79360e31c020081e6db29d2ecf371e6eeb 100644 (file)
@@ -6239,6 +6239,9 @@ This feature is available in Postfix 2.9 and later.
 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.
 .SH service_throttle_time (default: 60s)
 How long the Postfix \fBmaster\fR(8) waits before forking a server that
 appears to be malfunctioning.
index 1aaa5337d6fd08be8388c4a6555c39c7f554146b..2a43f6ff4d6d774968e4a62c130fec0670317afc 100644 (file)
@@ -255,6 +255,11 @@ The syslog facility of Postfix logging.
 .IP "\fBsyslog_name (see 'postconf -d' output)\fR"
 A prefix that is prepended to the process name in syslog
 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.
 .SH "SEE ALSO"
 .na
 .nf
index 23b155b7cb42c48d8918cbbc4d940d7e76186320..4e1e750fd696fa971e59b67a7c0d70f28424c11d 100644 (file)
@@ -131,6 +131,11 @@ Available in Postfix 3.0 and later:
 .IP "\fBsmtputf8_autodetect_classes (sendmail, verify)\fR"
 Detect that a message requires SMTPUTF8 support for the specified
 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.
 .SH "FILES"
 .na
 .nf
index ea2108a5ea42b1f6460b330e6cb9c5125c6c74d2..c9c6453486600c004a5d2a2d65ecc96503d2aafd 100644 (file)
@@ -424,7 +424,14 @@ records, so that, for example, "smtpd" becomes "prefix/smtpd".
 .PP
 Available in Postfix version 2.1 and later:
 .IP "\fBenable_original_recipient (yes)\fR"
-Enable support for the X\-Original\-To message header.
+Enable support for the original recipient address after an
+address is rewritten to a different address (for example with
+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.
 .SH "FILES"
 .na
 .nf
index 2932947ff40257164271464c56b14862ddff1a48..b2042c8551b843f0bbfffbf8fc624cc7861d3265 100644 (file)
@@ -90,6 +90,11 @@ The syslog facility of Postfix logging.
 .IP "\fBsyslog_name (see 'postconf -d' output)\fR"
 A prefix that is prepended to the process name in syslog
 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.
 .SH "SEE ALSO"
 .na
 .nf
index fe6eb5b932205f5aeb2af3883a825cf1c8214c3b..60759da82166bb579e2c7b806f3da15064df1e89 100644 (file)
@@ -70,6 +70,11 @@ The syslog facility of Postfix logging.
 .IP "\fBsyslog_name (see 'postconf -d' output)\fR"
 A prefix that is prepended to the process name in syslog
 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.
 .SH "SEE ALSO"
 .na
 .nf
index 5b8481e613731d0b0c8b90bc460effadda553121..815cb2cc7bd81cf298d6e310b11bafd12e0b53a7 100644 (file)
@@ -100,6 +100,11 @@ The syslog facility of Postfix logging.
 .IP "\fBsyslog_name (see 'postconf -d' output)\fR"
 A prefix that is prepended to the process name in syslog
 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.
 .SH "SEE ALSO"
 .na
 .nf
index abfaee2501d5b62c9f818dafc90f8397a824cf89..f22424b5fec9fae4404cfa53262d75ba91234eb5 100644 (file)
@@ -130,6 +130,11 @@ The syslog facility of Postfix logging.
 .IP "\fBsyslog_name (see 'postconf -d' output)\fR"
 A prefix that is prepended to the process name in syslog
 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.
 .SH "FILES"
 .na
 .nf
index baac83c89c7e835040a1fee2c8e09fff7ced9d29..ce4c8fd161df1fa80b8abfa06c6cfbe442e9623e 100644 (file)
@@ -395,13 +395,14 @@ The text below provides only a parameter summary. See
 .IP "\fBbiff (yes)\fR"
 Whether or not to use the local biff service.
 .IP "\fBexpand_owner_alias (no)\fR"
-When delivering to an alias "aliasname" that has an "owner\-aliasname"
-companion alias, set the envelope sender address to the expansion
-of the "owner\-aliasname" alias.
+When delivering to an alias "\fIaliasname\fR" that has an
+"owner\-\fIaliasname\fR" companion alias, set the envelope sender
+address to the expansion of the "owner\-\fIaliasname\fR" alias.
 .IP "\fBowner_request_special (yes)\fR"
-Give special treatment to owner\-listname and listname\-request
-address localparts: don't split such addresses when the
-recipient_delimiter is set to "\-".
+Enable special treatment for owner\-\fIlistname\fR entries in the
+\fBaliases\fR(5) file, and don't split owner\-\fIlistname\fR and
+\fIlistname\fR\-request address localparts when the recipient_delimiter
+is set to "\-".
 .IP "\fBsun_mailtool_compatibility (no)\fR"
 Obsolete SUN mailtool compatibility feature.
 .PP
@@ -600,6 +601,9 @@ Available in Postfix version 3.3 and later:
 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.
 .SH "FILES"
 .na
 .nf
index 58b75f8297a921cdf98d9502228a1f9f68b46bfd..c64b983803bb092a8ed687c32239c138dc20c51b 100644 (file)
@@ -144,8 +144,9 @@ mail on.
 The Internet protocols Postfix will attempt to use when making
 or accepting connections.
 .IP "\fBimport_environment (see 'postconf -d' output)\fR"
-The list of environment parameters that a Postfix process will
-import from a non\-Postfix parent process.
+The list of environment parameters that a privileged Postfix
+process will import from a non\-Postfix parent process, or name=value
+environment overrides.
 .IP "\fBmail_owner (postfix)\fR"
 The UNIX system account that owns the Postfix queue and most Postfix
 daemon processes.
@@ -160,6 +161,11 @@ The syslog facility of Postfix logging.
 .IP "\fBsyslog_name (see 'postconf -d' output)\fR"
 A prefix that is prepended to the process name in syslog
 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.
 .SH "FILES"
 .na
 .nf
index d24f1490242bc66d7a8f08637ed2656bf9ef0648..8599450f5ba10c70fb1ce4ee222af0b46910ec8f 100644 (file)
@@ -366,6 +366,11 @@ Available in Postfix version 3.0 and later:
 .IP "\fBconfirm_delay_cleared (no)\fR"
 After sending a "your message is delayed" notification, inform
 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.
 .SH "FILES"
 .na
 .nf
index abe837062712d547c31c6afd97fa2a12af948bc9..a6dae20f5c986b101a084fc0dd61ce5630559c0f 100644 (file)
@@ -100,6 +100,11 @@ The syslog facility of Postfix logging.
 .IP "\fBsyslog_name (see 'postconf -d' output)\fR"
 A prefix that is prepended to the process name in syslog
 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.
 .SH "SEE ALSO"
 .na
 .nf
index c74333cad5e6c6f09cd54cbbf863fbe5e0718b62..8727a27e0a56bbf84b90cdd2b2a44c82b22d0dd1 100644 (file)
@@ -446,6 +446,9 @@ Available in Postfix version 3.3 and later:
 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.
 .SH "SEE ALSO"
 .na
 .nf
index 0b28e87c9c9a4fc803add65d9bc5603be3f87664..d2fcf6e6ffca6130d2de1b127ee8bd13733d9010 100644 (file)
@@ -399,6 +399,11 @@ The syslog facility of Postfix logging.
 .IP "\fBsyslog_name (see 'postconf -d' output)\fR"
 A prefix that is prepended to the process name in syslog
 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.
 .SH "SEE ALSO"
 .na
 .nf
index bdf5746fc1b75fff88b4a79b5d77298be6774481..b7ffba0d44c567d6d2551487b70d2cafff24a224 100644 (file)
@@ -197,6 +197,11 @@ caches, pseudo\-random numbers).
 .IP "\fBproxy_write_maps (see 'postconf -d' output)\fR"
 The lookup tables that the \fBproxymap\fR(8) server is allowed to
 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.
 .SH "SEE ALSO"
 .na
 .nf
index d26b45d52e71c279ec2f9536757fad61d752a859..76ce9f6a4fda9639a85fc0174e92f37fa4ec7cec 100644 (file)
@@ -430,6 +430,11 @@ Available in Postfix version 3.0 and later:
 .IP "\fBconfirm_delay_cleared (no)\fR"
 After sending a "your message is delayed" notification, inform
 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.
 .SH "FILES"
 .na
 .nf
index 7dfe9322662d040553f133cbf80ce339769c41f5..020ba505efbc966d94c0cf26ca488f4fa882ab42 100644 (file)
@@ -164,6 +164,11 @@ Available in Postfix version 2.5 and later:
 .IP "\fBqmqpd_client_port_logging (no)\fR"
 Enable logging of the remote QMQP client port in addition to
 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.
 .SH "SEE ALSO"
 .na
 .nf
index afa1aed011debc2e5e75b74cc7bfbf3cf2855372..c5da8e9017c4d54b4be7a9e5eb07b21585824fbf 100644 (file)
@@ -131,6 +131,11 @@ The syslog facility of Postfix logging.
 .IP "\fBsyslog_name (see 'postconf -d' output)\fR"
 A prefix that is prepended to the process name in syslog
 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.
 .SH "SEE ALSO"
 .na
 .nf
index 431086356299d366831be5ecd1acf62a0bdaf3a1..0a31d5908a2092340fc9c9c70dc048b28e9ee39d 100644 (file)
@@ -86,6 +86,11 @@ records, so that, for example, "smtpd" becomes "prefix/smtpd".
 Available in Postfix version 2.9 and later:
 .IP "\fBenable_long_queue_ids (no)\fR"
 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.
 .SH "FILES"
 .na
 .nf
index 07bc27b562eb6711451f33ee57089ae024888415..5cd85af7f683f2c9cfa2d54d504a0ca1e5b26118 100644 (file)
@@ -765,6 +765,11 @@ found or that are unreachable.
 Available with Postfix 3.2 and later:
 .IP "\fBsmtp_tcp_port (smtp)\fR"
 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.
 .SH "SEE ALSO"
 .na
 .nf
index 402460e09101bbec18ab143b768ba277a1054644..4650b6decfc17bb79685ead633418275d88162db 100644 (file)
@@ -1110,6 +1110,11 @@ Available in Postfix version 2.5 and later:
 .IP "\fBsmtpd_client_port_logging (no)\fR"
 Enable logging of the remote SMTP client port in addition to
 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.
 .SH "SEE ALSO"
 .na
 .nf
index 1a5fcea12fe58b8392e33f4455c451bc9e22254a..2a5fb26c918863faeaad9a31d831164b7f36305d 100644 (file)
@@ -125,6 +125,11 @@ The syslog facility of Postfix logging.
 .IP "\fBsyslog_name (see 'postconf -d' output)\fR"
 A prefix that is prepended to the process name in syslog
 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.
 .SH "SEE ALSO"
 .na
 .nf
index 66321865a9ed4ed141925a35c4acc769168706ff..cd5aad981d9dd82809a67b8118382e696baa35d7 100644 (file)
@@ -152,6 +152,11 @@ The syslog facility of Postfix logging.
 .IP "\fBsyslog_name (see 'postconf -d' output)\fR"
 A prefix that is prepended to the process name in syslog
 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.
 .SH "SEE ALSO"
 .na
 .nf
index 87ecfac3ee3297a5db118801057d9f15681eb302..149bbb3e32bdd8a125645abae7ac6f941d0b6b48 100644 (file)
@@ -190,6 +190,11 @@ The syslog facility of Postfix logging.
 .IP "\fBsyslog_name (see 'postconf -d' output)\fR"
 A prefix that is prepended to the process name in syslog
 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.
 .SH "SEE ALSO"
 .na
 .nf
index a85235ff72ccde1bedf1ae3bd9e505c15dadae5f..061340260e0cb28887c7fe0e73a1869e8612165f 100644 (file)
@@ -281,6 +281,11 @@ Available in Postfix version 2.0 and later:
 .IP "\fBhelpful_warnings (yes)\fR"
 Log warnings about problematic configuration settings, and provide
 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.
 .SH "SEE ALSO"
 .na
 .nf
index 3c23b5f3c08147cb33886f9532b07f9435b972be..6898e241f6caec52a75ceaf48c3174a6c35a3eb4 100644 (file)
@@ -208,6 +208,11 @@ The syslog facility of Postfix logging.
 .IP "\fBsyslog_name (see 'postconf -d' output)\fR"
 A prefix that is prepended to the process name in syslog
 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.
 .SH "SEE ALSO"
 .na
 .nf
index 7d321c0f34e0c4d2e8084a2d900281c349d296fb..025987b7680a21a252a09ba1489f979a77ef82dd 100644 (file)
@@ -295,6 +295,9 @@ Available in Postfix version 3.3 and later:
 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.
 .SH "SEE ALSO"
 .na
 .nf
index 9739114a2ca38e42b0453dfcabeba64b5270ce22..6b779b2699d63cd8d9fb1d67354bcf9cda183c87 100644 (file)
@@ -8131,6 +8131,13 @@ prepend_delivered_header = forward
 The process name of a Postfix command or daemon process.
 </p>
 
+%PARAM service_name read-only
+
+<p>
+The master.cf service name of a Postfix daemon process, or the
+process name of a non-daemon process.
+</p>
+
 %PARAM process_id read-only
 
 <p>
index b2c82ec2827d7569dfcc861078f590dc62f9bf86..48495a006af858e5c3230e3d62a05e077e8bc47a 100644 (file)
 /* .IP "\fBsyslog_name (see 'postconf -d' output)\fR"
 /*     A prefix that is prepended to the process name in syslog
 /*     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.
 /* SEE ALSO
 /*     smtpd(8), Postfix SMTP server
 /*     postconf(5), configuration parameters
index 304775b969a213e7a766d5edb9d8d673d3183a07..826464832bf405c7601c24b20c1947bcbed317ff 100644 (file)
 /* .IP "\fBsmtputf8_autodetect_classes (sendmail, verify)\fR"
 /*     Detect that a message requires SMTPUTF8 support for the specified
 /*     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.
 /* FILES
 /*     /var/spool/postfix/bounce/* non-delivery records
 /*     /var/spool/postfix/defer/* non-delivery records
index b295d04fa74f330850c617b8d7af1ab538509e11..19fb1fea03cdb273425c857e8e86b73da74462de 100644 (file)
 /* .PP
 /*     Available in Postfix version 2.1 and later:
 /* .IP "\fBenable_original_recipient (yes)\fR"
-/*     Enable support for the X-Original-To message header.
+/*     Enable support for the original recipient address after an
+/*     address is rewritten to a different address (for example with
+/*     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.
 /* FILES
 /*     /etc/postfix/canonical*, canonical mapping table
 /*     /etc/postfix/virtual*, virtual mapping table
index e95a6b6ccd9a38eccb0c86c711cf5072c3e5086e..b5d13a25fc3e9261279fdf6e1052bac2bb0daf9a 100644 (file)
 /* .IP "\fBsyslog_name (see 'postconf -d' output)\fR"
 /*     A prefix that is prepended to the process name in syslog
 /*     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.
 /* SEE ALSO
 /*     qmgr(8), queue manager
 /*     bounce(8), delivery status reports
index a182798a8b95c75f6b34547cdb0657f50a281a6a..eaf5dbadab4eb25a1e0fc8d89750a6261c648ce1 100644 (file)
 /* .IP "\fBsyslog_name (see 'postconf -d' output)\fR"
 /*     A prefix that is prepended to the process name in syslog
 /*     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.
 /* SEE ALSO
 /*     smtpd(8), Postfix SMTP server
 /*     postconf(5), configuration parameters
index 2f40615bee51e7b56bf8aadd284ea27bd7478756..0b1fd5fcc0b3461b53b0afa0281ee1e65eb20051 100644 (file)
 /* .IP "\fBsyslog_name (see 'postconf -d' output)\fR"
 /*     A prefix that is prepended to the process name in syslog
 /*     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.
 /* SEE ALSO
 /*     qmgr(8), queue manager
 /*     bounce(8), delivery status reports
index ee93ec83143e38af717bdae3fd50452a88768bce..e8958c0c2923176315c2f6677e4c10ce210452d6 100644 (file)
 /* .IP "\fBsyslog_name (see 'postconf -d' output)\fR"
 /*     A prefix that is prepended to the process name in syslog
 /*     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.
 /* FILES
 /*     /var/spool/postfix/flush, "fast flush" logfiles.
 /* SEE ALSO
index 8e69b96220a5929009a86e8e5c9364467d1da269..203e52feaae3314c5eb3b1b5a7435b1f75884cbb 100644 (file)
@@ -36,6 +36,7 @@
 /*     int     var_event_drain;
 /*     int     var_bundle_rcpt;
 /*     char    *var_procname;
+/*     char    *var_servname;
 /*     int     var_pid;
 /*     int     var_ipc_timeout;
 /*     char    *var_pid_dir;
@@ -249,6 +250,7 @@ int     var_event_drain;
 int     var_idle_limit;
 int     var_bundle_rcpt;
 char   *var_procname;
+char   *var_servname;
 int     var_pid;
 int     var_ipc_timeout;
 char   *var_pid_dir;
index 41868e3311c067a822daddd6d94476cf2c0ed1bf..16a8e1e7f1f8e65451361c9148cdbe70a1800ab5 100644 (file)
@@ -2413,6 +2413,9 @@ extern char *var_proxy_write_acl;
 #define VAR_PROCNAME           "process_name"
 extern char *var_procname;
 
+#define VAR_SERVNAME           "service_name"
+extern char *var_servname;
+
 #define VAR_PID                        "process_id"
 extern int var_pid;
 
index 06b582507b64fc2a68eb0d6a523872d7df258933..c49862b9d1d42c8c4c0fc6775e170adc4015673b 100644 (file)
@@ -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      "20180107"
+#define MAIL_RELEASE_DATE      "20180113"
 #define MAIL_VERSION_NUMBER    "3.3"
 
 #ifdef SNAPSHOT
index dfd453fa734c1b2c805a261ee5075aae2e30afb9..cbf226110e539e239afa397d308922c0eb46ab38 100644 (file)
 /* .IP "\fBbiff (yes)\fR"
 /*     Whether or not to use the local biff service.
 /* .IP "\fBexpand_owner_alias (no)\fR"
-/*     When delivering to an alias "aliasname" that has an "owner-aliasname"
-/*     companion alias, set the envelope sender address to the expansion
-/*     of the "owner-aliasname" alias.
+/*     When delivering to an alias "\fIaliasname\fR" that has an
+/*     "owner-\fIaliasname\fR" companion alias, set the envelope sender
+/*     address to the expansion of the "owner-\fIaliasname\fR" alias.
 /* .IP "\fBowner_request_special (yes)\fR"
-/*     Give special treatment to owner-listname and listname-request
-/*     address localparts: don't split such addresses when the
-/*     recipient_delimiter is set to "-".
+/*     Enable special treatment for owner-\fIlistname\fR entries in the
+/*     \fBaliases\fR(5) file, and don't split owner-\fIlistname\fR and
+/*     \fIlistname\fR-request address localparts when the recipient_delimiter
+/*     is set to "-".
 /* .IP "\fBsun_mailtool_compatibility (no)\fR"
 /*     Obsolete SUN mailtool compatibility feature.
 /* .PP
 /*     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.
 /* FILES
 /*     The following are examples; details differ between systems.
 /*     $HOME/.forward, per-user aliasing
index f3f4888f29c4921763c89130fc6e47d5ad6b6c11..184ff65e57b498eb9f309d93921ba31ff2e0726d 100644 (file)
@@ -684,6 +684,7 @@ NORETURN event_server_main(int argc, char **argv, MULTI_SERVER_FN service,...)
            break;
        }
     }
+    set_mail_conf_str(VAR_SERVNAME, service_name);
 
     /*
      * Initialize generic parameters.
index bceccc62d395de2d55f9dcdd321b63def98b2f07..edba574cf880c9ff4f88eb1357e401c3a76a68f4 100644 (file)
 /*     The Internet protocols Postfix will attempt to use when making
 /*     or accepting connections.
 /* .IP "\fBimport_environment (see 'postconf -d' output)\fR"
-/*     The list of environment parameters that a Postfix process will
-/*     import from a non-Postfix parent process.
+/*     The list of environment parameters that a privileged Postfix
+/*     process will import from a non-Postfix parent process, or name=value
+/*     environment overrides.
 /* .IP "\fBmail_owner (postfix)\fR"
 /*     The UNIX system account that owns the Postfix queue and most Postfix
 /*     daemon processes.
 /* .IP "\fBsyslog_name (see 'postconf -d' output)\fR"
 /*     A prefix that is prepended to the process name in syslog
 /*     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.
 /* FILES
 /* .ad
 /* .fi
index 0edef95d53d3a1c8a02028b9ab82ab3143fd0602..22dc4635cd33cd545eb53267fa4bf705c15f6849 100644 (file)
@@ -680,6 +680,7 @@ NORETURN multi_server_main(int argc, char **argv, MULTI_SERVER_FN service,...)
            break;
        }
     }
+    set_mail_conf_str(VAR_SERVNAME, service_name);
 
     /*
      * Initialize generic parameters.
index f027befe278153517570f526ab1147944e74d73f..ed93dfe6b6140f6ba14eb60b189fd4f3eedc1c44 100644 (file)
@@ -558,6 +558,7 @@ NORETURN single_server_main(int argc, char **argv, SINGLE_SERVER_FN service,...)
            break;
        }
     }
+    set_mail_conf_str(VAR_SERVNAME, service_name);
 
     /*
      * Initialize generic parameters.
index 71bd50ee5e20b26d0a36727f0488cf98e2d13827..5762e1af6b8b70d1146744fa851b510622f4969d 100644 (file)
@@ -561,6 +561,7 @@ NORETURN trigger_server_main(int argc, char **argv, TRIGGER_SERVER_FN service,..
            break;
        }
     }
+    set_mail_conf_str(VAR_SERVNAME, service_name);
 
     /*
      * Initialize generic parameters.
index d85a3dbcb4af8d544d49444c11f658dfd3fa3556..4eb0083fc82b3136226cc58ce4ed194d40e74ddb 100644 (file)
 /* .IP "\fBconfirm_delay_cleared (no)\fR"
 /*     After sending a "your message is delayed" notification, inform
 /*     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.
 /* FILES
 /*     /var/spool/postfix/incoming, incoming queue
 /*     /var/spool/postfix/active, active queue
index 653fc6cc96808ba84981ae21ddafd420b975c8bb..46804d26f8303757b17f3f1ca3f4a9506dcc5eb0 100644 (file)
 /* .IP "\fBsyslog_name (see 'postconf -d' output)\fR"
 /*     A prefix that is prepended to the process name in syslog
 /*     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.
 /* SEE ALSO
 /*     cleanup(8), message canonicalization
 /*     sendmail(1), Sendmail-compatible interface
index fe01d4b7f10071030b9058d67b94119ca78bb07a..db8c4422e7fb2e48e66d3d44b382721f6a99e33c 100644 (file)
 /*     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.
 /* SEE ALSO
 /*     qmgr(8), queue manager
 /*     bounce(8), delivery status reports
index 1a039e5426a8475e6f3e9136e8040baba5d532c4..5deed50b31fbb44a7207c6d60b8c87a1067dd909 100644 (file)
@@ -54,7 +54,7 @@ tests: test1 test2 test3 test4 test5 test6 test7 test8 test9 test10 test11 \
        test31 test32 test33 test34 test35 test36 test37 test39 test40 test41 \
        test42 test43 test44 test45 test46 test47 test48 test49 test50 test51 \
        test52 test53 test54 test55 test56 test57 test58 test59 test60 test61 \
-       test62 test63 test64 test65 test66
+       test62 test63 test64 test65 test66 test67
 
 root_tests:
 
@@ -904,6 +904,22 @@ test66: $(PROG) test66.ref
        sed "s;PWD;`pwd`;" test66.ref | diff - test66.tmp
        rm -f main.cf master.cf test66.tmp test66.cf
 
+# expand process name and service name in master.cf.
+
+test67: $(PROG) test67.ref
+       rm -f main.cf master.cf
+       touch master.cf
+       echo 'smtp inet n - n - - smtpd' >>master.cf
+       echo ' -o test1_process_name=$$process_name' >> master.cf
+       echo ' -o test1_service_name=$$service_name' >> master.cf
+       echo 'smtp unix n - n - - smtp' >>master.cf
+       echo ' -o test2_process_name=$$process_name' >> master.cf
+       echo ' -o test2_service_name=$$service_name' >> master.cf
+       touch -t 197101010000 main.cf
+       $(SHLIB_ENV) ./$(PROG) -xMfc. >test67.tmp 2>&1
+       diff test67.ref test67.tmp
+       rm -f main.cf master.cf test67.tmp
+
 printfck: $(OBJS) $(PROG)
        rm -rf printfck
        mkdir printfck
index a80f3e2fe9513293b7e24840572a5a88e0afd57c..44c1d5697bd73191b32e3bed9119d8d614082ff8 100644 (file)
@@ -1000,7 +1000,8 @@ int     main(int argc, char **argv)
        pcf_read_parameters();
        if (override_params)
            pcf_set_parameters(override_params->argv);
-       pcf_register_builtin_parameters(basename(argv[0]), getpid());
+       pcf_register_builtin_parameters(basename(argv[0]), basename(argv[0]),
+                                       getpid());
        pcf_register_service_parameters();
        pcf_register_user_parameters();
        if (pcf_cmd_mode & PCF_MASTER_FLD)
@@ -1012,6 +1013,7 @@ int     main(int argc, char **argv)
        else
            pcf_show_master_entries(VSTREAM_OUT, pcf_cmd_mode, argc - optind,
                                    argv + optind);
+       pcf_flag_unused_master_parameters();
     }
 
     /*
@@ -1052,7 +1054,8 @@ int     main(int argc, char **argv)
            if (override_params)
                pcf_set_parameters(override_params->argv);
        }
-       pcf_register_builtin_parameters(basename(argv[0]), getpid());
+       pcf_register_builtin_parameters(basename(argv[0]), basename(argv[0]),
+                                       getpid());
 
        /*
         * Add service-dependent parameters (service names from master.cf)
index 124c6bdfdcf04d2512558b399d8dbbc85d2c7002..7f391df68a12b639c1913569fe31763619763261 100644 (file)
@@ -118,6 +118,7 @@ typedef struct {
     char   *name_space;                        /* service/type, parameter name space */
     ARGV   *argv;                      /* null, or master.cf fields */
     DICT   *all_params;                        /* null, or all name=value entries */
+    DICT   *ro_params;                 /* read-only name=value entries */
     HTABLE *valid_names;               /* null, or "valid" parameter names */
 } PCF_MASTER_ENT;
 
@@ -250,7 +251,7 @@ extern NAME_CODE pcf_field_name_offset[];
  /*
   * postconf_builtin.c.
   */
-extern void pcf_register_builtin_parameters(const char *, pid_t);
+extern void pcf_register_builtin_parameters(const char *, const char *, pid_t);
 
  /*
   * postconf_service.c.
index 1088433b30a8c6666639231df067174d656cf979..311c362da4bf8f61b31271cf0efead654afe4993 100644 (file)
@@ -6,8 +6,9 @@
 /* SYNOPSIS
 /*     #include <postconf.h>
 /*
-/*     void    pcf_register_builtin_parameters(procname, pid)
+/*     void    pcf_register_builtin_parameters(procname, servname, pid)
 /*     const char *procname;
+/*     const char *servname;
 /*     pid_t   pid;
 /* DESCRIPTION
 /*     pcf_register_builtin_parameters() initializes the global
@@ -17,6 +18,8 @@
 /*     Arguments:
 /*.IP procname
 /*     Provides the default value for the "process_name" parameter.
+/*.IP servname
+/*     Provides the default value for the "service_name" parameter.
 /*.IP pid
 /*     Provides the default value for the "process_id" parameter.
 /* DIAGNOSTICS
@@ -173,6 +176,7 @@ static const CONFIG_STR_FN_TABLE pcf_str_fn_table[] = {
   * effects, then those side effects must happen only once.
   */
 static CONFIG_STR_TABLE pcf_adhoc_procname = {VAR_PROCNAME};
+static CONFIG_STR_TABLE pcf_adhoc_servname = {VAR_SERVNAME};
 static CONFIG_INT_TABLE pcf_adhoc_pid = {VAR_PID};
 
 #define STR(x) vstring_str(x)
@@ -362,7 +366,8 @@ static const char *pcf_conv_long_parameter(void *ptr)
 
 /* pcf_register_builtin_parameters - add built-ins to the global name space */
 
-void    pcf_register_builtin_parameters(const char *procname, pid_t pid)
+void    pcf_register_builtin_parameters(const char *procname,
+                                           const char *servname, pid_t pid)
 {
     const char *myname = "pcf_register_builtin_parameters";
     const CONFIG_TIME_TABLE *ctt;
@@ -445,6 +450,10 @@ void    pcf_register_builtin_parameters(const char *procname, pid_t pid)
     PCF_PARAM_TABLE_ENTER(pcf_param_table, pcf_adhoc_procname.name,
                          PCF_PARAM_FLAG_BUILTIN | PCF_PARAM_FLAG_READONLY,
                      (void *) &pcf_adhoc_procname, pcf_conv_str_parameter);
+    pcf_adhoc_servname.defval = mystrdup(servname);
+    PCF_PARAM_TABLE_ENTER(pcf_param_table, pcf_adhoc_servname.name,
+                         PCF_PARAM_FLAG_BUILTIN | PCF_PARAM_FLAG_READONLY,
+                     (void *) &pcf_adhoc_servname, pcf_conv_str_parameter);
     pcf_adhoc_pid.defval = pid;
     PCF_PARAM_TABLE_ENTER(pcf_param_table, pcf_adhoc_pid.name,
                          PCF_PARAM_FLAG_BUILTIN | PCF_PARAM_FLAG_READONLY,
index 2a2ff7a6bb71dbe04193e2332f9c0519b31f44ec..3cfa9f3b0473ec9aeba7c92b9ad9d117590a43c1 100644 (file)
 /*     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
 /*--*/
 
 /* System library. */
@@ -107,14 +112,17 @@ const char *pcf_lookup_parameter_value(int mode, const char *name,
 {
     const char *value = 0;
 
+#define LOOKUP(dict, name) ((dict) ? dict_get((dict), (name)) : 0)
+
     /*
      * Local name=value entries in master.cf take precedence over global
      * name=value entries in main.cf. Built-in defaults have the lowest
      * precedence.
      */
     if ((mode & PCF_SHOW_DEFS) != 0
-       || ((local_scope == 0 || local_scope->all_params == 0
-            || (value = dict_get(local_scope->all_params, name)) == 0)
+       || ((local_scope == 0
+            || ((value = LOOKUP(local_scope->ro_params, name)) == 0
+                && (value = LOOKUP(local_scope->all_params, name)) == 0))
            && (value = dict_lookup(CONFIG_DICT, name)) == 0
            && (mode & PCF_SHOW_NONDEF) == 0)) {
        if (node != 0 || (node = PCF_PARAM_TABLE_FIND(pcf_param_table, name)) != 0)
index e6cf4e3b1b5bb0fb369cfca9d88488f0c13b0653..71d0daf027124dc1168997217687c362ef57b2f4 100644 (file)
@@ -353,6 +353,8 @@ void    pcf_free_master_entry(PCF_MASTER_ENT *masterp)
     argv_free(masterp->argv);
     if (masterp->valid_names)
        htable_free(masterp->valid_names, myfree);
+    if (masterp->ro_params)
+       dict_free(masterp->ro_params);
     if (masterp->all_params)
        dict_free(masterp->all_params);
     myfree((void *) masterp);
@@ -363,6 +365,8 @@ void    pcf_free_master_entry(PCF_MASTER_ENT *masterp)
 const char *pcf_parse_master_entry(PCF_MASTER_ENT *masterp, const char *buf)
 {
     ARGV   *argv;
+    char   *ro_name_space;
+    char   *process_name;
 
     /*
      * We can't use the master daemon's master_ent routines in their current
@@ -384,8 +388,17 @@ const char *pcf_parse_master_entry(PCF_MASTER_ENT *masterp, const char *buf)
     pcf_normalize_daemon_args(argv);
     masterp->name_space =
        concatenate(argv->argv[0], PCF_NAMESP_SEP_STR, argv->argv[1], (char *) 0);
+    ro_name_space =
+       concatenate("ro", PCF_NAMESP_SEP_STR, masterp->name_space, (char *) 0);
     masterp->argv = argv;
     masterp->valid_names = 0;
+    process_name = basename(argv->argv[PCF_MASTER_FLD_CMD]);
+    dict_update(ro_name_space, VAR_PROCNAME, process_name);
+    dict_update(ro_name_space, VAR_SERVNAME,
+               strcmp(process_name, argv->argv[0]) != 0 ?
+               argv->argv[0] : process_name);
+    masterp->ro_params = dict_handle(ro_name_space);
+    myfree(ro_name_space);
     masterp->all_params = 0;
     return (0);
 }
index 1ca585ef6569ccd20d6a24a3724e0ffbb57675f0..fa3a5d71d90732b2f1b8e2b3c5fbe040c754a449 100644 (file)
@@ -4,3 +4,4 @@ foo        unix  -       n       n       -       0       other -v
     -o ccc=bbb
     -v
     -o ddd=bbb
+./postconf: warning: ./master.cf: unused parameter: ddd=$ccc
index 9776e8edf734d3605864c176f3da0ba8792de225..f8200d40146be1e5b3619d2d633749f76419a83d 100644 (file)
@@ -3,10 +3,16 @@ bar        unix  -       n       n       -       0       other
     -o xxx=yyy
     -o aaa=bbb
 baz        unix  -       n       n       -       0       other
+./postconf: warning: ./master.cf: unused parameter: aaa=bbb
+./postconf: warning: ./master.cf: unused parameter: xxx=yyy
 foo        unix  -       n       n       -       0       other
 bar        unix  -       n       n       -       0       other
     -o xxx=YYY
     -o aaa=BBB
 baz        unix  -       n       n       -       0       other
+./postconf: warning: ./master.cf: unused parameter: aaa=BBB
+./postconf: warning: ./master.cf: unused parameter: xxx=YYY
 bar/unix/aaa = BBB
 bar/unix/xxx = YYY
+./postconf: warning: ./master.cf: unused parameter: aaa=BBB
+./postconf: warning: ./master.cf: unused parameter: xxx=YYY
index fb95ae9610a2fd8187bc3facb62d7707631ee087..80676f350b8a198732de7508a49b5dfb36b94cc1 100644 (file)
@@ -3,8 +3,12 @@ bar        unix  -       n       n       -       0       other
     -o xxx=yyy
     -o aaa=bbb
 baz        unix  -       n       n       -       0       other
+./postconf: warning: ./master.cf: unused parameter: aaa=bbb
+./postconf: warning: ./master.cf: unused parameter: xxx=yyy
 bar/unix/aaa = bbb
 bar/unix/xxx = yyy
+./postconf: warning: ./master.cf: unused parameter: aaa=bbb
+./postconf: warning: ./master.cf: unused parameter: xxx=yyy
 foo        unix  -       n       n       -       0       other
 bar        unix  -       n       n       -       0       other
 baz        unix  -       n       n       -       0       other
index 34707f43036926e953c81f78e19906af23c51441..2bfea0e05d372706de7398e57287cf5def5582e1 100644 (file)
@@ -3,3 +3,4 @@ bar        unix  -       n       y       -       0       aa -stuff
     -o bb=cc
     dd
 baz        unix  -       n       n       -       0       other
+./postconf: warning: ./master.cf: unused parameter: bb=cc
index e25a238998eb6250dd4552df7d7e41bacf6ed5c3..b8cf23d1cdf3e832c2974cc77f67660a16a77327 100644 (file)
@@ -3,3 +3,4 @@ xx         inet  -       n       n       -       0       aa -stuff
     -o bb=cc
     dd
 baz        unix  -       n       n       -       0       other
+./postconf: warning: ./master.cf: unused parameter: bb=cc
index 9c2e1fd7f792122eb944cc95e692c579128d5507..3a7e57f6aa97e5c12a6281f2c12ae0600e998f34 100644 (file)
@@ -6,3 +6,5 @@ bar        inet  -       n       n       0       0       other
     -o {name2=value2a value2b}
     arg1a arg1b {arg2a arg2b} {arg3a arg3b}
 baz        unix  -       n       n       0       0       other
+./postconf: warning: ./master.cf: unused parameter: name1=value1
+./postconf: warning: ./master.cf: unused parameter: name2=value2a value2b
diff --git a/postfix/src/postconf/test67.ref b/postfix/src/postconf/test67.ref
new file mode 100644 (file)
index 0000000..03def6f
--- /dev/null
@@ -0,0 +1,10 @@
+smtp       inet  n       -       n       -       -       smtpd
+    -o test1_process_name=smtpd
+    -o test1_service_name=smtp
+smtp       unix  n       -       n       -       -       smtp
+    -o test2_process_name=smtp
+    -o test2_service_name=smtp
+./postconf: warning: ./master.cf: unused parameter: test1_process_name=$process_name
+./postconf: warning: ./master.cf: unused parameter: test1_service_name=$service_name
+./postconf: warning: ./master.cf: unused parameter: test2_process_name=$process_name
+./postconf: warning: ./master.cf: unused parameter: test2_service_name=$service_name
index e2621fba22beb7eaa92cfe4cedef89bf83828118..976bdf914bbfa0a5fd31ad21e3398b276bd5c3e6 100644 (file)
 /* .IP "\fBsyslog_name (see 'postconf -d' output)\fR"
 /*     A prefix that is prepended to the process name in syslog
 /*     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.
 /* SEE ALSO
 /*     smtpd(8), Postfix SMTP server
 /*     tlsproxy(8), Postfix TLS proxy server
index b2b386ca3b147cf5eb044ddff8377ef35336b1c2..4eeae1a84cc61344dc94d580466dc4c5aba1d021 100644 (file)
 /* .IP "\fBproxy_write_maps (see 'postconf -d' output)\fR"
 /*     The lookup tables that the \fBproxymap\fR(8) server is allowed to
 /*     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.
 /* SEE ALSO
 /*     postconf(5), configuration parameters
 /*     master(5), generic daemon options
index b8c0d930c0bddc0bb0ac5049435b975e8fc36a2e..143da8acf697c9f93aa746a38e552ab18725c5b0 100644 (file)
 /* .IP "\fBconfirm_delay_cleared (no)\fR"
 /*     After sending a "your message is delayed" notification, inform
 /*     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.
 /* FILES
 /*     /var/spool/postfix/incoming, incoming queue
 /*     /var/spool/postfix/active, active queue
index 071b2cbd488727bc21621998ba81e731d8707463..0d1af9945bb8c34acbb011a6fdec5ea57ba447f2 100644 (file)
 /* .IP "\fBqmqpd_client_port_logging (no)\fR"
 /*     Enable logging of the remote QMQP client port in addition to
 /*     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.
 /* SEE ALSO
 /*     http://cr.yp.to/proto/qmqp.html, QMQP protocol
 /*     cleanup(8), message canonicalization
index f139c0d5c1c75f2232306b0273bdf9f7c8ddea97..f49aa9d6a7068ed13194e78ff20ed90429e830af 100644 (file)
 /* .IP "\fBsyslog_name (see 'postconf -d' output)\fR"
 /*     A prefix that is prepended to the process name in syslog
 /*     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.
 /* SEE ALSO
 /*     smtp(8), SMTP client
 /*     postconf(5), configuration parameters
index 156f7d44e656180a2348038fe45985da77329337..5f941f8f4a979341452e5c9c9161575e27965b71 100644 (file)
 /*     Available in Postfix version 2.9 and later:
 /* .IP "\fBenable_long_queue_ids (no)\fR"
 /*     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.
 /* FILES
 /*     /var/spool/postfix, queue directories
 /* SEE ALSO
index 1dd37bfee0c2b835b805776dbff4958035ec131f..73449ea4c764586019db8e221f4e9170aa8779a2 100644 (file)
 /*     Available with Postfix 3.2 and later:
 /* .IP "\fBsmtp_tcp_port (smtp)\fR"
 /*     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.
 /* SEE ALSO
 /*     generic(5), output address rewriting
 /*     header_checks(5), message header content inspection
index 3deb6fc8e14def4429a1de60c7234e17ee85a68e..ad9858916e7af6c309d766487ef75c396a31f008 100644 (file)
 /* .IP "\fBsmtpd_client_port_logging (no)\fR"
 /*     Enable logging of the remote SMTP client port in addition to
 /*     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.
 /* SEE ALSO
 /*     anvil(8), connection/rate limiting
 /*     cleanup(8), message canonicalization
index 31517d870793faf5fa08f8cfabbabe891fce92c4..0eabd8b0b2adb713b5b818dbeecb81a0657c1537 100644 (file)
 /* .IP "\fBsyslog_name (see 'postconf -d' output)\fR"
 /*     A prefix that is prepended to the process name in syslog
 /*     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.
 /* SEE ALSO
 /*     postconf(5), configuration parameters
 /*     master(8), process manager
index 905783940e43f6631118fba721ef3eb166f10520..cf2ecc290ae94bd336afd0d817890a7ce082834f 100644 (file)
 /* .IP "\fBsyslog_name (see 'postconf -d' output)\fR"
 /*     A prefix that is prepended to the process name in syslog
 /*     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.
 /* SEE ALSO
 /*     smtp(8), Postfix SMTP client
 /*     smtpd(8), Postfix SMTP server
index 383ba0d60dbb472f2415e19554d95b726917c98b..3883323f31fb1f2cf5059158b5e1eb32a61e16bb 100644 (file)
 /* .IP "\fBsyslog_name (see 'postconf -d' output)\fR"
 /*     A prefix that is prepended to the process name in syslog
 /*     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.
 /* SEE ALSO
 /*     postscreen(8), Postfix zombie blocker
 /*     smtpd(8), Postfix SMTP server
index d7cb6b91043ae2545975cccb3ce60905da2b3df3..4e194fa87ec09db17920dc0b6bc2adf3282d0174 100644 (file)
 /* .IP "\fBhelpful_warnings (yes)\fR"
 /*     Log warnings about problematic configuration settings, and provide
 /*     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.
 /* SEE ALSO
 /*     postconf(5), configuration parameters
 /*     transport(5), transport table format
index ef96ba785a93598cfac25ccff8aff51f973104c1..3f014dbbe9997dbeb70803501220559125e5d67a 100644 (file)
 /* .IP "\fBsyslog_name (see 'postconf -d' output)\fR"
 /*     A prefix that is prepended to the process name in syslog
 /*     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.
 /* SEE ALSO
 /*     smtpd(8), Postfix SMTP server
 /*     cleanup(8), enqueue Postfix message
index a7273ebf8432b55f37305a8f1254c9faacd8736e..622ec2302b9d7d02942e99144308a6a1a73e2fe8 100644 (file)
 /*     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.
 /* SEE ALSO
 /*     qmgr(8), queue manager
 /*     bounce(8), delivery status reports