From: Wietse Venema Date: Sat, 30 Oct 2004 05:00:00 +0000 (-0500) Subject: postfix-2.2-20041030 X-Git-Tag: v2.2.0-RC1~31 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=59beae689662f4546ab064777c7f39915fa43941;p=thirdparty%2Fpostfix.git postfix-2.2-20041030 --- diff --git a/postfix/COMPATIBILITY b/postfix/COMPATIBILITY index eb7a5eadf..9bda1ac9b 100644 --- a/postfix/COMPATIBILITY +++ b/postfix/COMPATIBILITY @@ -40,7 +40,7 @@ mysql tables yes (contributed) netinfo tables yes (contributed) newaliases yes (main alias database only) nis tables yes -nis+ tables not yet +nis+ tables yes no <> in smtp yes (most common address forms) pgsql tables yes (contributed) pipeline option yes (server and client) diff --git a/postfix/HISTORY b/postfix/HISTORY index d20167c55..190e4536e 100644 --- a/postfix/HISTORY +++ b/postfix/HISTORY @@ -9816,12 +9816,17 @@ Apologies for any names omitted. the SMTP client. File: smtp/smtp_connect.c. Robustness: extra sanity checks. Files: util/dict_db.c, - util/dict_dbm.c. + util/dict_dbm.c, dict_nis.c. + +20041030 + + Compatibility: "session cache" renamed to "connection cache" + to avoid confusion with the TLS session cache. Open problems: - Low: reject HELO with any domain name that this MTA is - final destination for. + Low: reject HELO with any domain name or IP address that + this MTA is the final destination for. Low: should the Delivered-To: test in local(8) be configurable? diff --git a/postfix/RELEASE_NOTES b/postfix/RELEASE_NOTES index 38080ab09..98c353b44 100644 --- a/postfix/RELEASE_NOTES +++ b/postfix/RELEASE_NOTES @@ -7,6 +7,13 @@ snapshot release). Patches are issued for the official release and change the patchlevel and the release date. Patches are never issued for snapshot releases. +Incompatible changes with snapshot Postfix-2.2-20041030 +======================================================= + +The SMTP session cache is renamed to connection cache, to avoid +confusion with the TLS session cache. Thus, all session_cache_mumble +parameters are now called connection_cache_mumble. + Incompatible changes with snapshot Postfix-2.2-20041023 ======================================================= @@ -25,7 +32,7 @@ Major changes with snapshot Postfix-2.2-20041023 The NIS+ client by Geoff Gibbs is now part of the Postfix source tree. Details are given in the nisplus_table(5) manual page. -By default, Postfix no longer appends the its own domain to addresses +By default, Postfix no longer appends its own domain to addresses in message headers from remote clients. Thus, spam from poorly written software no longer looks like it came from a local user. diff --git a/postfix/html/master.5.html b/postfix/html/master.5.html index f0dbe4e89..77911f3e5 100644 --- a/postfix/html/master.5.html +++ b/postfix/html/master.5.html @@ -14,46 +14,47 @@ MASTER(5) MASTER(5) (mostly) client commands that are invoked by users, and by a larger number of services that run in the background. - Postfix services run under control of the master(8) pro- - cess. The master.cf configuration file defines how a + Postfix services are implemented by daemon processes. + These run in the background under control of the master(8) + process. The master.cf configuration file defines how a client program connects to a service, and what daemon pro- - gram runs when a service is requested. Most daemon pro- + gram runs when a service is requested. Most daemon pro- cesses are short-lived and terminate after serving max_use clients, or after inactivity for max_idle or more units of time. - All daemons specified here must speak a Postfix-internal + All daemons specified here must speak a Postfix-internal protocol. In order to execute non-Postfix software use the - local(8), pipe(8) or spawn(8) services, or run the server + local(8), pipe(8) or spawn(8) services, or run the server under control by inetd(8) or equivalent. - Changes in master.cf requires that "postfix reload" be - executed in order to reload the configuration. + After changing master.cf you must execute "postfix reload" + to reload the configuration. SYNTAX The general format of the master.cf file is as follows: o Each logical line defines a single Postfix service. - Each service is identified by its name and type as - described below. When multiple lines specify the - same service name and type, only the last one is + Each service is identified by its name and type as + described below. When multiple lines specify the + same service name and type, only the last one is remembered. Otherwise, the order of master.cf ser- vice definitions does not matter. - o Empty lines and whitespace-only lines are ignored, - as are lines whose first non-whitespace character + o Empty lines and whitespace-only lines are ignored, + as are lines whose first non-whitespace character is a `#'. - o A logical line starts with non-whitespace text. A - line that starts with whitespace continues a logi- + o A logical line starts with non-whitespace text. A + line that starts with whitespace continues a logi- cal line. - Each logical line consists of eight fields separated by - whitespace. These are described below in the order as + Each logical line consists of eight fields separated by + whitespace. These are described below in the order as they appear in the master.cf file. Where applicable a field of "-" requests that the built-in - default value be used. For boolean fields specify "y" or + default value be used. For boolean fields specify "y" or "n" to override the default value. Service name @@ -63,143 +64,143 @@ MASTER(5) MASTER(5) Service type Specify one of the following service types: - inet The service listens on a TCP/IP socket and + inet The service listens on a TCP/IP socket and is therefore accessible via the network. - The service name is specified as host:port, + The service name is specified as host:port, denoting the host and port on which new con- - nections should be accepted. The host part - (and colon) may be omitted. Either host or - port may be given in symbolic form (host or + nections should be accepted. The host part + (and colon) may be omitted. Either host or + port may be given in symbolic form (host or service name) or in numeric form (IP address or port number). - Examples: a service name of 127.0.0.1:smtp - receives mail via the loopback interface - only; and a service name of 10025 accepts + Examples: a service name of 127.0.0.1:smtp + receives mail via the loopback interface + only; and a service name of 10025 accepts connections on TCP port 10025 via all inter- - faces configured with the inet_interfaces + faces configured with the inet_interfaces parameter. - unix The service listens on a UNIX-domain socket + unix The service listens on a UNIX-domain socket and is accessible for local clients only. - The service name is a pathname relative to - the Postfix queue directory (pathname con- - trolled with the queue_directory configura- + The service name is a pathname relative to + the Postfix queue directory (pathname con- + trolled with the queue_directory configura- tion parameter in main.cf). - On Solaris systems the unix type is imple- + On Solaris systems the unix type is imple- mented with streams sockets. - fifo The service listens on a FIFO (named pipe) + fifo The service listens on a FIFO (named pipe) and is accessible for local clients only. - The service name is a pathname relative to - the Postfix queue directory (pathname con- - trolled with the queue_directory configura- + The service name is a pathname relative to + the Postfix queue directory (pathname con- + trolled with the queue_directory configura- tion parameter in main.cf). Private (default: y) - Whether or not access is restricted to the mail - system. Internet (type inet) services can't be + Whether or not access is restricted to the mail + system. Internet (type inet) services can't be private. Unprivileged (default: y) Whether the service runs with root privileges or as - the owner of the Postfix system (the owner name is + the owner of the Postfix system (the owner name is controlled by the mail_owner configuration variable in the main.cf file). - The local(8), pipe(8), spawn(8), and virtual(8) + The local(8), pipe(8), spawn(8), and virtual(8) daemons require privileges. Chroot (default: y) - Whether or not the service runs chrooted to the + Whether or not the service runs chrooted to the mail queue directory (pathname is controlled by the - queue_directory configuration variable in the + queue_directory configuration variable in the main.cf file). Chroot should not be used with the local(8), - pipe(8) and spawn(8) daemons. Although the prox- - ymap(8) server can run chrooted, doing so defeats - most of the purpose of having that service in the + pipe(8) and spawn(8) daemons. Although the prox- + ymap(8) server can run chrooted, doing so defeats + most of the purpose of having that service in the first place. The files in the examples/chroot-setup subdirectory - of the Postfix source archive describe how to set - up a Postfix chroot environment for your type of - machine, and BASIC_CONFIGURATION_README discusses + of the Postfix source archive describe how to set + up a Postfix chroot environment for your type of + machine, and BASIC_CONFIGURATION_README discusses issues related to running daemons chrooted. Wakeup time (default: 0) - Automatically wake up the named service after the - specified number of seconds. The wake up is imple- - mented by connecting to the service and sending a - wake up request. A ? at the end of the wake up - time field requests that wake up events be sent - only to services that are actually being used. + Automatically wake up the named service after the + specified number of seconds. The wake up is imple- + mented by connecting to the service and sending a + wake up request. A ? at the end of the wake up + time field requests that wake up events be sent + only to services that are actually being used. Specify 0 for no automatic wake up. The pickup(8), qmgr(8) and flush(8) daemons require a wake up timer. Process limit (default: $default_process_limit) - The maximum number of processes that may execute - this service simultaneously. Specify 0 for no pro- + The maximum number of processes that may execute + this service simultaneously. Specify 0 for no pro- cess count limit. NOTE: Some Postfix services must be configured as a - single-process service (for example, qmgr(8)) and - some services must be configured with no process + single-process service (for example, qmgr(8)) and + some services must be configured with no process limit (for example, cleanup(8)). These limits must not be changed. Command name + arguments - The command to be executed. Characters that are - special to the shell such as ">" or "|" have no - special meaning here, and quotes cannot be used to + The command to be executed. Characters that are + special to the shell such as ">" or "|" have no + special meaning here, and quotes cannot be used to protect arguments containing whitespace. - The command name is relative to the Postfix daemon + The command name is relative to the Postfix daemon directory (pathname is controlled by the dae- mon_directory configuration variable). - The command argument syntax for specific commands - is specified in the respective daemon manual page. + The command argument syntax for specific commands + is specified in the respective daemon manual page. - The following command-line options have the same + The following command-line options have the same effect for all daemon programs: - -D Run the daemon under control by the command + -D Run the daemon under control by the command specified with the debugger_command variable in the main.cf configuration file. See DEBUG_README for hints and tips. -o name=value Override the named main.cf configuration - parameter. The parameter value can refer to + parameter. The parameter value can refer to other parameters as $name etc., just like in main.cf. See postconf(5) for syntax. NOTE 1: do not specify whitespace around the - "=". In parameter values, either avoid + "=". In parameter values, either avoid whitespace altogether, use commas instead of - spaces, or consider overrides like "-o - name=$override_parameter" with $over- + spaces, or consider overrides like "-o + name=$override_parameter" with $over- ride_parameter set in main.cf. - NOTE 2: Over-zealous use of parameter over- - rides makes the Postfix configuration hard - to understand and maintain. At a certain - point, it might be easier to configure mul- - tiple instances of Postfix, instead of con- + NOTE 2: Over-zealous use of parameter over- + rides makes the Postfix configuration hard + to understand and maintain. At a certain + point, it might be easier to configure mul- + tiple instances of Postfix, instead of con- figuring multiple personalities via mas- ter.cf. - -v Increase the verbose logging level. Specify - multiple -v options to make a command more - verbose. + -v Increase the verbose logging level. Specify + multiple -v options to make a Postfix daemon + process increasingly verbose. SEE ALSO master(8), process manager @@ -210,7 +211,7 @@ MASTER(5) MASTER(5) DEBUG_README, Postfix debugging LICENSE - The Secure Mailer license must be distributed with this + The Secure Mailer license must be distributed with this software. AUTHOR(S) diff --git a/postfix/html/postconf.5.html b/postfix/html/postconf.5.html index 7265524fa..66599d4fa 100644 --- a/postfix/html/postconf.5.html +++ b/postfix/html/postconf.5.html @@ -5326,7 +5326,7 @@ The default time unit is s (seconds).
session_cache_service (default: scache)
-

The name of the scache(8) session cache service. This service +

The name of the scache(8) connection cache service. This service maintains a limited pool of cached sessions.

@@ -5336,7 +5336,7 @@ maintains a limited pool of cached sessions.

(default: 600s)

How frequently the scache(8) server logs usage statistics with -session cache hit and miss rates for logical destinations and for +connection cache hit and miss rates for logical destinations and for physical endpoints.

@@ -5345,7 +5345,7 @@ physical endpoints.

session_cache_ttl_limit (default: 2s)
-

The maximal time-to-live value that the session cache server +

The maximal time-to-live value that the connection cache server allows. Requests that specify a larger TTL will be stored with the maximum allowed TTL. The purpose of this additional control is to protect the infrastructure against careless people. The cache TTL @@ -5503,7 +5503,7 @@ ignored.

smtp_connection_cache_on_demand (default: yes)
-

Temporarily enable SMTP session caching while a destination +

Temporarily enable SMTP connection caching while a destination has a high volume of mail in the active queue. With SMTP connection caching, a connection is not closed immediately after completion of a mail transaction. Instead, the connection is kept open for @@ -5519,7 +5519,7 @@ delivery performance.

smtp_connection_cache_reuse_limit (default: 10)
-

When SMTP session caching is enabled, the number of times that +

When SMTP connection caching is enabled, the number of times that an SMTP session is reused before it is closed.

@@ -5531,7 +5531,7 @@ an SMTP session is reused before it is closed.
smtp_connection_cache_time_limit (default: 2s)
-

When SMTP session caching is enabled, the amount of time that +

When SMTP connection caching is enabled, the amount of time that an unused SMTP client socket is kept open before it is closed. Do not specify larger values without permission from the remote sites.

diff --git a/postfix/html/postfix-manuals.html b/postfix/html/postfix-manuals.html index d066ba359..c73b36369 100644 --- a/postfix/html/postfix-manuals.html +++ b/postfix/html/postfix-manuals.html @@ -188,7 +188,7 @@ the following convention:

  • qmqpd(8), Postfix QMQP server -
  • scache(8), Postfix session cache manager +
  • scache(8), Postfix connection cache manager
  • showq(8), list Postfix mail queue diff --git a/postfix/html/postfix.1.html b/postfix/html/postfix.1.html index c71d72f8a..aacc67fcf 100644 --- a/postfix/html/postfix.1.html +++ b/postfix/html/postfix.1.html @@ -244,7 +244,7 @@ POSTFIX(1) POSTFIX(1) proxymap(8), Postfix lookup table proxy server qmgr(8), Postfix queue manager qmqpd(8), Postfix QMQP server - scache(8), Postfix session cache manager + scache(8), Postfix connection cache manager showq(8), list Postfix mail queue smtp(8), Postfix SMTP client smtpd(8), Postfix SMTP server diff --git a/postfix/html/scache.8.html b/postfix/html/scache.8.html index 79cb1f0d9..d2d54cee7 100644 --- a/postfix/html/scache.8.html +++ b/postfix/html/scache.8.html @@ -7,47 +7,48 @@ SCACHE(8) SCACHE(8) NAME - scache - Postfix session cache server + scache - Postfix connection cache server SYNOPSIS scache [generic Postfix daemon options] DESCRIPTION - The scache server maintains a shared multi-session cache. - This information can be used by, for example, Postfix SMTP - clients or other Postfix delivery agents. + The scache server maintains a shared multi-connection + cache. This information can be used by, for example, Post- + fix SMTP clients or other Postfix delivery agents. - The session cache is organized into logical destination - names, physical endpoint names, and sessions. + The connection cache is organized into logical destination + names, physical endpoint names, and connections. As a specific example, logical SMTP destinations specify (transport, domain, port), and physical SMTP endpoints - specify (transport, IP address, port). An SMTP session + specify (transport, IP address, port). An SMTP connection may be saved after a successful mail transaction. In the general case, one logical destination may refer to zero or more physical endpoints, one physical endpoint may be referenced by zero or more logical destinations, and - one endpoint may refer to zero or more sessions. + one endpoint may refer to zero or more connections. The exact syntax of a logical destination or endpoint name is application dependent; the scache service does not - care. A session is stored as a file descriptor together - with application-dependent information that is needed to - re-activate a session object. Again, the scache service is - completely unaware about the details of that information. + care. A connection is stored as a file descriptor + together with application-dependent information that is + needed to re-activate a connection object. Again, the + scache service is completely unaware about the details of + that information. All information is stored with a finite time to live - (ttl). The session cache daemon terminates when no client - is connected for max_idle time units. + (ttl). The connection cache daemon terminates when no + client is connected for max_idle time units. This server implements the following requests: save_endp ttl endpoint endpoint_properties file_descriptor - Save the specified file descriptor and session + Save the specified file descriptor and connection property data under the specified endpoint name. The endpoint properties are used by the client to - re-activate a passivated session object. + re-activate a passivated connection object. find_endp endpoint Look up cached properties and a cached file @@ -56,9 +57,9 @@ SCACHE(8) SCACHE(8) save_dest ttl destination destination_properties endpoint Save the binding between a logical destination and an endpoint under the destination name, together - with destination specific session properties. The - destination properties are used by the client to - re-activate a passivated session object. + with destination specific connection properties. + The destination properties are used by the client + to re-activate a passivated connection object. find_dest destination Look up cached destination properties, cached end- @@ -66,14 +67,14 @@ SCACHE(8) SCACHE(8) the specified logical destination. SECURITY - The session cache server is not security-sensitive. It + The connection cache server is not security-sensitive. It does not talk to the network, and it does not talk to local users. The scache server can run chrooted at fixed low privilege. - The session cache server is not a trusted process. It must - not be used to store information that is security sensi- - tive. + The connection cache server is not a trusted process. It + must not be used to store information that is security + sensitive. DIAGNOSTICS Problems and transactions are logged to syslogd(8). @@ -81,8 +82,8 @@ SCACHE(8) SCACHE(8) BUGS Sessions cannot be cached across multiple machines. - When a session expires from the cache it is closed without - protocol specific handshake. + When a connection expires from the cache it is closed + without protocol specific handshake. CONFIGURATION PARAMETERS Changes to main.cf are picked up automatically as @@ -93,13 +94,13 @@ SCACHE(8) SCACHE(8) postconf(5) for more details including examples. RESOURCE CONTROLS - session_cache_ttl_limit (2s) - The maximal time-to-live value that the session + connection_cache_ttl_limit (2s) + The maximal time-to-live value that the connection cache server allows. - session_cache_status_update_time (600s) + connection_cache_status_update_time (600s) How frequently the scache(8) server logs usage - statistics with session cache hit and miss rates + statistics with connection cache hit and miss rates for logical destinations and for physical end- points. diff --git a/postfix/html/smtp.8.html b/postfix/html/smtp.8.html index a06853f46..ed49cc183 100644 --- a/postfix/html/smtp.8.html +++ b/postfix/html/smtp.8.html @@ -35,11 +35,11 @@ SMTP(8) SMTP(8) client will try to deliver the mail to an alternate host. After a successful mail transaction, a session may be - saved to the scache(8) session cache server, so that it + saved to the scache(8) connection cache server, so that it may be used by any SMTP client for a subsequent transac- tion. - By default, session caching is enabled temporarily for + By default, connection caching is enabled temporarily for destinations that have a high volume of mail in the active queue. Session caching can be enabled permanently for spe- cific destinations. @@ -71,21 +71,22 @@ SMTP(8) SMTP(8) and of other trouble. BUGS - SMTP session caching does not work with TLS. The necessary - support for TLS object passivation and re-activation does - not exist without closing the session, which defeats the - purpose. + SMTP connection caching does not work with TLS. The neces- + sary support for TLS object passivation and re-activation + does not exist without closing the session, which defeats + the purpose. - SMTP session caching assumes that SASL credentials are + SMTP connection caching assumes that SASL credentials are valid for all destinations that map onto the same IP - address and TCP port. + address and TCP port, and for all sender and recipient + addresses. CONFIGURATION PARAMETERS Changes to main.cf are picked up automatically, as smtp(8) - processes run for only a limited amount of time. Use the + processes run for only a limited amount of time. Use the command "postfix reload" to speed up a change. - The text below provides only a parameter summary. See + The text below provides only a parameter summary. See postconf(5) for more details including examples. COMPATIBILITY CONTROLS @@ -99,7 +100,7 @@ SMTP(8) SMTP(8) Never send EHLO at the start of an SMTP session. smtp_defer_if_no_mx_address_found (no) - Defer mail delivery when no MX record resolves to + Defer mail delivery when no MX record resolves to an IP address. smtp_line_length_limit (990) @@ -107,17 +108,17 @@ SMTP(8) SMTP(8) that Postfix will send via SMTP. smtp_pix_workaround_delay_time (10s) - How long the Postfix SMTP client pauses before + How long the Postfix SMTP client pauses before sending ".<CR><LF>" in order to work around the PIX firewall "<CR><LF>.<CR><LF>" bug. smtp_pix_workaround_threshold_time (500s) - How long a message must be queued before the PIX - firewall "<CR><LF>.<CR><LF>" bug workaround is + How long a message must be queued before the PIX + firewall "<CR><LF>.<CR><LF>" bug workaround is turned on. smtp_quote_rfc821_envelope (yes) - Quote addresses in SMTP MAIL FROM and RCPT TO com- + Quote addresses in SMTP MAIL FROM and RCPT TO com- mands as required by RFC 821. smtp_skip_5xx_greeting (yes) @@ -125,7 +126,7 @@ SMTP(8) SMTP(8) (go away, do not try again later). smtp_skip_quit_response (yes) - Do not wait for the response to the SMTP QUIT com- + Do not wait for the response to the SMTP QUIT com- mand. Available in Postfix version 2.0 and earlier: @@ -138,7 +139,7 @@ SMTP(8) SMTP(8) Available in Postfix version 2.0 and later: disable_mime_output_conversion (no) - Disable the conversion of 8BITMIME format to 7BIT + Disable the conversion of 8BITMIME format to 7BIT format. mime_boundary_length_limit (2048) @@ -153,49 +154,49 @@ SMTP(8) SMTP(8) Available in Postfix version 2.1 and later: smtp_send_xforward_command (no) - Send the non-standard XFORWARD command when the - Postfix SMTP server EHLO response announces XFOR- + Send the non-standard XFORWARD command when the + Postfix SMTP server EHLO response announces XFOR- WARD support. SASL AUTHENTICATION CONTROLS smtp_sasl_auth_enable (no) - Enable SASL authentication in the Postfix SMTP + Enable SASL authentication in the Postfix SMTP client. smtp_sasl_password_maps (empty) - Optional SMTP client lookup tables with one user- - name:password entry per remote hostname or domain. + Optional SMTP client lookup tables with one user- + name:password entry per remote hostname or domain. smtp_sasl_security_options (noplaintext, noanonymous) - What authentication mechanisms the Postfix SMTP + What authentication mechanisms the Postfix SMTP client is allowed to use. Available in Postfix version 2.2 and later: smtp_sasl_mechanism_filter (empty) - If non-empty, filters the SMTP server's list of + If non-empty, filters the SMTP server's list of offered SASL mechanisms. RESOURCE AND RATE CONTROLS smtp_destination_concurrency_limit ($default_destina- tion_concurrency_limit) - The maximal number of parallel deliveries to the - same destination via the smtp message delivery + The maximal number of parallel deliveries to the + same destination via the smtp message delivery transport. smtp_destination_recipient_limit ($default_destina- tion_recipient_limit) - The maximal number of recipients per delivery via + The maximal number of recipients per delivery via the smtp message delivery transport. smtp_connect_timeout (30s) - The SMTP client time limit for completing a TCP + The SMTP client time limit for completing a TCP connection, or zero (use the operating system built-in time limit). smtp_helo_timeout (300s) - The SMTP client time limit for sending the HELO or - EHLO command, and for receiving the initial server + The SMTP client time limit for sending the HELO or + EHLO command, and for receiving the initial server response. smtp_xforward_timeout (300s) @@ -203,30 +204,30 @@ SMTP(8) SMTP(8) command, and for receiving the server response. smtp_mail_timeout (300s) - The SMTP client time limit for sending the MAIL - FROM command, and for receiving the server + The SMTP client time limit for sending the MAIL + FROM command, and for receiving the server response. smtp_rcpt_timeout (300s) - The SMTP client time limit for sending the SMTP - RCPT TO command, and for receiving the server + The SMTP client time limit for sending the SMTP + RCPT TO command, and for receiving the server response. smtp_data_init_timeout (120s) - The SMTP client time limit for sending the SMTP - DATA command, and for receiving the server + The SMTP client time limit for sending the SMTP + DATA command, and for receiving the server response. smtp_data_xfer_timeout (180s) - The SMTP client time limit for sending the SMTP + The SMTP client time limit for sending the SMTP message content. smtp_data_done_timeout (600s) - The SMTP client time limit for sending the SMTP + The SMTP client time limit for sending the SMTP ".", and for receiving the server response. smtp_quit_timeout (300s) - The SMTP client time limit for sending the QUIT + The SMTP client time limit for sending the QUIT command, and for receiving the server response. Available in Postfix version 2.1 and later: @@ -237,77 +238,77 @@ SMTP(8) SMTP(8) lookups, or zero (no limit). smtp_mx_session_limit (2) - The maximal number of SMTP sessions per delivery - request before giving up or delivering to a fall- + The maximal number of SMTP sessions per delivery + request before giving up or delivering to a fall- back relay host, or zero (no limit). smtp_rset_timeout (20s) - The SMTP client time limit for sending the RSET + The SMTP client time limit for sending the RSET command, and for receiving the server response. Available in Postfix version 2.2 and later: smtp_connection_cache_destinations (empty) - Permanently enable SMTP connection caching for the + Permanently enable SMTP connection caching for the specified destinations. smtp_connection_cache_on_demand (yes) - Temporarily enable SMTP session caching while a + Temporarily enable SMTP connection caching while a destination has a high volume of mail in the active queue. smtp_connection_cache_reuse_limit (10) - When SMTP session caching is enabled, the number of - times that an SMTP session is reused before it is - closed. + When SMTP connection caching is enabled, the number + of times that an SMTP session is reused before it + is closed. smtp_connection_cache_time_limit (2s) - When SMTP session caching is enabled, the amount of - time that an unused SMTP client socket is kept open - before it is closed. + When SMTP connection caching is enabled, the amount + of time that an unused SMTP client socket is kept + open before it is closed. TROUBLE SHOOTING CONTROLS debug_peer_level (2) - The increment in verbose logging level when a - remote client or server matches a pattern in the + The increment in verbose logging level when a + remote client or server matches a pattern in the debug_peer_list parameter. debug_peer_list (empty) - Optional list of remote client or server hostname - or network address patterns that cause the verbose - logging level to increase by the amount specified + Optional list of remote client or server hostname + or network address patterns that cause the verbose + logging level to increase by the amount specified in $debug_peer_level. error_notice_recipient (postmaster) - The recipient of postmaster notifications about - mail delivery problems that are caused by policy, + The recipient of postmaster notifications about + mail delivery problems that are caused by policy, resource, software or protocol errors. notify_classes (resource, software) - The list of error classes that are reported to the + The list of error classes that are reported to the postmaster. MISCELLANEOUS CONTROLS best_mx_transport (empty) - Where the Postfix SMTP client should deliver mail + Where the Postfix SMTP client should deliver mail when it detects a "mail loops back to myself" error condition. config_directory (see 'postconf -d' output) - The default location of the Postfix main.cf and + The default location of the Postfix main.cf and master.cf configuration files. daemon_timeout (18000s) - How much time a Postfix daemon process may take to - handle a request before it is terminated by a + How much time a Postfix daemon process may take to + handle a request before it is terminated by a built-in watchdog timer. disable_dns_lookups (no) - Disable DNS lookups in the Postfix SMTP and LMTP + Disable DNS lookups in the Postfix SMTP and LMTP clients. fallback_relay (empty) - Optional list of relay hosts for SMTP destinations + Optional list of relay hosts for SMTP destinations that can't be found or that are unreachable. inet_interfaces (all) @@ -319,25 +320,25 @@ SMTP(8) SMTP(8) over an internal communication channel. max_idle (100s) - The maximum amount of time that an idle Postfix - daemon process waits for the next service request + The maximum amount of time that an idle Postfix + daemon process waits for the next service request before exiting. max_use (100) - The maximal number of connection requests before a + The maximal number of connection requests before a Postfix daemon process terminates. process_id (read-only) - The process ID of a Postfix command or daemon pro- + The process ID of a Postfix command or daemon pro- cess. process_name (read-only) - The process name of a Postfix command or daemon + The process name of a Postfix command or daemon process. proxy_interfaces (empty) The network interface addresses that this mail sys- - tem receives mail on by way of a proxy or network + tem receives mail on by way of a proxy or network address translation unit. smtp_bind_address (empty) @@ -345,29 +346,29 @@ SMTP(8) SMTP(8) client should bind to when making a connection. smtp_helo_name ($myhostname) - The hostname to send in the SMTP EHLO or HELO com- + The hostname to send in the SMTP EHLO or HELO com- mand. smtp_host_lookup (dns) - What mechanisms when the SMTP client uses to look + What mechanisms when the SMTP client uses to look up a host's IP address. smtp_randomize_addresses (yes) - Randomize the order of equal-preference MX host + Randomize the order of equal-preference MX host addresses. syslog_facility (mail) The syslog facility of Postfix logging. syslog_name (postfix) - The mail system name that is prepended to the pro- + The mail system name that is prepended to the pro- cess name in syslog records, so that "smtpd" becomes, for example, "postfix/smtpd". SEE ALSO qmgr(8), queue manager bounce(8), delivery status reports - scache(8), session cache server + scache(8), connection cache server postconf(5), configuration parameters master(8), process manager syslogd(8), system logging @@ -376,7 +377,7 @@ SMTP(8) SMTP(8) SASL_README, Postfix SASL howto LICENSE - The Secure Mailer license must be distributed with this + The Secure Mailer license must be distributed with this software. AUTHOR(S) diff --git a/postfix/man/man1/postfix.1 b/postfix/man/man1/postfix.1 index 4fa90c5ad..ff4512a48 100644 --- a/postfix/man/man1/postfix.1 +++ b/postfix/man/man1/postfix.1 @@ -209,7 +209,7 @@ pipe(8), deliver mail to non-Postfix command proxymap(8), Postfix lookup table proxy server qmgr(8), Postfix queue manager qmqpd(8), Postfix QMQP server -scache(8), Postfix session cache manager +scache(8), Postfix connection cache manager showq(8), list Postfix mail queue smtp(8), Postfix SMTP client smtpd(8), Postfix SMTP server diff --git a/postfix/man/man5/master.5 b/postfix/man/man5/master.5 index 182b3e3bc..925a09e27 100644 --- a/postfix/man/man5/master.5 +++ b/postfix/man/man5/master.5 @@ -12,7 +12,8 @@ The Postfix mail system is implemented by small number of (mostly) client commands that are invoked by users, and by a larger number of services that run in the background. -Postfix services run under control of the \fBmaster\fR(8) +Postfix services are implemented by daemon processes. These +run in the background under control of the \fBmaster\fR(8) process. The master.cf configuration file defines how a client program connects to a service, and what daemon program runs when a service is requested. Most daemon @@ -25,8 +26,8 @@ protocol. In order to execute non-Postfix software use the \fBlocal\fR(8), \fBpipe\fR(8) or \fBspawn\fR(8) services, or run the server under control by \fBinetd\fR(8) or equivalent. .PP -Changes in master.cf requires that "\fBpostfix reload\fR" be -executed in order to reload the configuration. +After changing master.cf you must execute "\fBpostfix reload\fR" +to reload the configuration. .SH "SYNTAX" .na .nf @@ -177,7 +178,7 @@ instances of Postfix, instead of configuring multiple personalities via master.cf. .IP \fB-v\fR Increase the verbose logging level. Specify multiple \fB-v\fR -options to make a command more verbose. +options to make a Postfix daemon process increasingly verbose. .SH "SEE ALSO" .na .nf diff --git a/postfix/man/man5/postconf.5 b/postfix/man/man5/postconf.5 index 1eb814f51..c19b82f59 100644 --- a/postfix/man/man5/postconf.5 +++ b/postfix/man/man5/postconf.5 @@ -2872,14 +2872,14 @@ appears to be malfunctioning. Time units: s (seconds), m (minutes), h (hours), d (days), w (weeks). The default time unit is s (seconds). .SH session_cache_service (default: scache) -The name of the scache(8) session cache service. This service +The name of the scache(8) connection cache service. This service maintains a limited pool of cached sessions. .SH session_cache_status_update_time (default: 600s) How frequently the scache(8) server logs usage statistics with -session cache hit and miss rates for logical destinations and for +connection cache hit and miss rates for logical destinations and for physical endpoints. .SH session_cache_ttl_limit (default: 2s) -The maximal time-to-live value that the session cache server +The maximal time-to-live value that the connection cache server allows. Requests that specify a larger TTL will be stored with the maximum allowed TTL. The purpose of this additional control is to protect the infrastructure against careless people. The cache TTL @@ -2964,7 +2964,7 @@ ignored. .PP This feature is available in Postfix 2.2 and later. .SH smtp_connection_cache_on_demand (default: yes) -Temporarily enable SMTP session caching while a destination +Temporarily enable SMTP connection caching while a destination has a high volume of mail in the active queue. With SMTP connection caching, a connection is not closed immediately after completion of a mail transaction. Instead, the connection is kept open for @@ -2974,12 +2974,12 @@ delivery performance. .PP This feature is available in Postfix 2.2 and later. .SH smtp_connection_cache_reuse_limit (default: 10) -When SMTP session caching is enabled, the number of times that +When SMTP connection caching is enabled, the number of times that an SMTP session is reused before it is closed. .PP This feature is available in Postfix 2.2 and later. .SH smtp_connection_cache_time_limit (default: 2s) -When SMTP session caching is enabled, the amount of time that +When SMTP connection caching is enabled, the amount of time that an unused SMTP client socket is kept open before it is closed. Do not specify larger values without permission from the remote sites. .PP diff --git a/postfix/man/man8/scache.8 b/postfix/man/man8/scache.8 index fdd0fe002..f1d84df7a 100644 --- a/postfix/man/man8/scache.8 +++ b/postfix/man/man8/scache.8 @@ -4,7 +4,7 @@ .SH NAME scache \- -Postfix session cache server +Postfix connection cache server .SH "SYNOPSIS" .na .nf @@ -12,40 +12,40 @@ Postfix session cache server .SH DESCRIPTION .ad .fi -The \fBscache\fR server maintains a shared multi-session +The \fBscache\fR server maintains a shared multi-connection cache. This information can be used by, for example, Postfix SMTP clients or other Postfix delivery agents. -The session cache is organized into logical destination -names, physical endpoint names, and sessions. +The connection cache is organized into logical destination +names, physical endpoint names, and connections. As a specific example, logical SMTP destinations specify (transport, domain, port), and physical SMTP endpoints -specify (transport, IP address, port). An SMTP session +specify (transport, IP address, port). An SMTP connection may be saved after a successful mail transaction. In the general case, one logical destination may refer to zero or more physical endpoints, one physical endpoint may be referenced by zero or more logical destinations, and -one endpoint may refer to zero or more sessions. +one endpoint may refer to zero or more connections. The exact syntax of a logical destination or endpoint name is application dependent; the \fBscache\fR service does -not care. A session is stored as a file descriptor together +not care. A connection is stored as a file descriptor together with application-dependent information that is needed to -re-activate a session object. Again, the \fBscache\fR +re-activate a connection object. Again, the \fBscache\fR service is completely unaware about the details of that information. All information is stored with a finite time to live (ttl). -The session cache daemon terminates when no client is +The connection cache daemon terminates when no client is connected for \fBmax_idle\fR time units. This server implements the following requests: .IP "\fBsave_endp\fI ttl endpoint endpoint_properties file_descriptor\fR" -Save the specified file descriptor and session property data +Save the specified file descriptor and connection property data under the specified endpoint name. The endpoint properties -are used by the client to re-activate a passivated session +are used by the client to re-activate a passivated connection object. .IP "\fBfind_endp\fI endpoint\fR" Look up cached properties and a cached file descriptor for the @@ -53,8 +53,8 @@ specified endpoint. .IP "\fBsave_dest\fI ttl destination destination_properties endpoint\fR" Save the binding between a logical destination and an endpoint under the destination name, together with destination -specific session properties. The destination properties -are used by the client to re-activate a passivated session +specific connection properties. The destination properties +are used by the client to re-activate a passivated connection object. .IP "\fBfind_dest\fI destination\fR" Look up cached destination properties, cached endpoint properties, @@ -64,11 +64,11 @@ and a cached file descriptor for the specified logical destination. .nf .ad .fi -The session cache server is not security-sensitive. It does not +The connection cache server is not security-sensitive. It does not talk to the network, and it does not talk to local users. The scache server can run chrooted at fixed low privilege. -The session cache server is not a trusted process. It must +The connection cache server is not a trusted process. It must not be used to store information that is security sensitive. .SH DIAGNOSTICS .ad @@ -79,7 +79,7 @@ Problems and transactions are logged to \fBsyslogd\fR(8). .fi Sessions cannot be cached across multiple machines. -When a session expires from the cache it is closed without +When a connection expires from the cache it is closed without protocol specific handshake. .SH "CONFIGURATION PARAMETERS" .na @@ -97,12 +97,12 @@ postconf(5) for more details including examples. .nf .ad .fi -.IP "\fBsession_cache_ttl_limit (2s)\fR" -The maximal time-to-live value that the session cache server +.IP "\fBconnection_cache_ttl_limit (2s)\fR" +The maximal time-to-live value that the connection cache server allows. -.IP "\fBsession_cache_status_update_time (600s)\fR" +.IP "\fBconnection_cache_status_update_time (600s)\fR" How frequently the scache(8) server logs usage statistics with -session cache hit and miss rates for logical destinations and for +connection cache hit and miss rates for logical destinations and for physical endpoints. .SH "MISCELLANEOUS CONTROLS" .na diff --git a/postfix/man/man8/smtp.8 b/postfix/man/man8/smtp.8 index 6126844b6..c5be8ab70 100644 --- a/postfix/man/man8/smtp.8 +++ b/postfix/man/man8/smtp.8 @@ -33,10 +33,10 @@ to a recoverable error condition, the SMTP client will try to deliver the mail to an alternate host. After a successful mail transaction, a session may be saved -to the \fBscache(8)\fR session cache server, so that it +to the \fBscache(8)\fR connection cache server, so that it may be used by any SMTP client for a subsequent transaction. -By default, session caching is enabled temporarily for +By default, connection caching is enabled temporarily for destinations that have a high volume of mail in the active queue. Session caching can be enabled permanently for specific destinations. @@ -74,12 +74,13 @@ other trouble. .SH BUGS .ad .fi -SMTP session caching does not work with TLS. The necessary +SMTP connection caching does not work with TLS. The necessary support for TLS object passivation and re-activation does not exist without closing the session, which defeats the purpose. -SMTP session caching assumes that SASL credentials are valid for -all destinations that map onto the same IP address and TCP port. +SMTP connection caching assumes that SASL credentials are valid for +all destinations that map onto the same IP address and TCP port, +and for all sender and recipient addresses. .SH "CONFIGURATION PARAMETERS" .na .nf @@ -221,13 +222,13 @@ Available in Postfix version 2.2 and later: Permanently enable SMTP connection caching for the specified destinations. .IP "\fBsmtp_connection_cache_on_demand (yes)\fR" -Temporarily enable SMTP session caching while a destination +Temporarily enable SMTP connection caching while a destination has a high volume of mail in the active queue. .IP "\fBsmtp_connection_cache_reuse_limit (10)\fR" -When SMTP session caching is enabled, the number of times that +When SMTP connection caching is enabled, the number of times that an SMTP session is reused before it is closed. .IP "\fBsmtp_connection_cache_time_limit (2s)\fR" -When SMTP session caching is enabled, the amount of time that +When SMTP connection caching is enabled, the amount of time that an unused SMTP client socket is kept open before it is closed. .SH "TROUBLE SHOOTING CONTROLS" .na @@ -305,7 +306,7 @@ records, so that "smtpd" becomes, for example, "postfix/smtpd". .nf qmgr(8), queue manager bounce(8), delivery status reports -scache(8), session cache server +scache(8), connection cache server postconf(5), configuration parameters master(8), process manager syslogd(8), system logging diff --git a/postfix/mantools/postlink b/postfix/mantools/postlink index 4e1400e68..612a7a600 100755 --- a/postfix/mantools/postlink +++ b/postfix/mantools/postlink @@ -302,9 +302,9 @@ while (<>) { s;\bservice_throttle_time\b;$&;g; s;\bsetgid_group\b;$&;g; - s;\bsession_cache_service\b;$&;g; - s;\bsession_cache_status_update_time\b;$&;g; - s;\bsession_cache_ttl_limit\b;$&;g; + s;\bconnection_cache_service\b;$&;g; + s;\bconnection_cache_status_update_time\b;$&;g; + s;\bconnection_cache_ttl_limit\b;$&;g; s;\bshow_user_unknown_table_name\b;$&;g; s;\bshowq_service_name\b;$&;g; diff --git a/postfix/proto/master b/postfix/proto/master index e7aa5fa91..b43c65185 100644 --- a/postfix/proto/master +++ b/postfix/proto/master @@ -8,7 +8,8 @@ # (mostly) client commands that are invoked by users, and by # a larger number of services that run in the background. # -# Postfix services run under control of the \fBmaster\fR(8) +# Postfix services are implemented by daemon processes. These +# run in the background under control of the \fBmaster\fR(8) # process. The master.cf configuration file defines how a # client program connects to a service, and what daemon # program runs when a service is requested. Most daemon @@ -21,8 +22,8 @@ # \fBlocal\fR(8), \fBpipe\fR(8) or \fBspawn\fR(8) services, or # run the server under control by \fBinetd\fR(8) or equivalent. # .PP -# Changes in master.cf requires that "\fBpostfix reload\fR" be -# executed in order to reload the configuration. +# After changing master.cf you must execute "\fBpostfix reload\fR" +# to reload the configuration. # SYNTAX # .ad # .fi @@ -171,7 +172,7 @@ # personalities via master.cf. # .IP \fB-v\fR # Increase the verbose logging level. Specify multiple \fB-v\fR -# options to make a command more verbose. +# options to make a Postfix daemon process increasingly verbose. # SEE ALSO # master(8), process manager # postconf(5), configuration parameters diff --git a/postfix/proto/postconf.proto b/postfix/proto/postconf.proto index f9040db33..d08cad61d 100644 --- a/postfix/proto/postconf.proto +++ b/postfix/proto/postconf.proto @@ -3243,7 +3243,7 @@ documentation for more detail.

    %PARAM smtp_connection_cache_time_limit 2s -

    When SMTP session caching is enabled, the amount of time that +

    When SMTP connection caching is enabled, the amount of time that an unused SMTP client socket is kept open before it is closed. Do not specify larger values without permission from the remote sites.

    @@ -3252,7 +3252,7 @@ not specify larger values without permission from the remote sites. %PARAM smtp_connection_cache_reuse_limit 10 -

    When SMTP session caching is enabled, the number of times that +

    When SMTP connection caching is enabled, the number of times that an SMTP session is reused before it is closed.

    @@ -3292,7 +3292,7 @@ ignored. %PARAM smtp_connection_cache_on_demand yes -

    Temporarily enable SMTP session caching while a destination +

    Temporarily enable SMTP connection caching while a destination has a high volume of mail in the active queue. With SMTP connection caching, a connection is not closed immediately after completion of a mail transaction. Instead, the connection is kept open for @@ -7201,12 +7201,12 @@ and virtual_alias_maps.

    %PARAM session_cache_service scache -

    The name of the scache(8) session cache service. This service +

    The name of the scache(8) connection cache service. This service maintains a limited pool of cached sessions.

    %PARAM session_cache_ttl_limit 2s -

    The maximal time-to-live value that the session cache server +

    The maximal time-to-live value that the connection cache server allows. Requests that specify a larger TTL will be stored with the maximum allowed TTL. The purpose of this additional control is to protect the infrastructure against careless people. The cache TTL @@ -7215,7 +7215,7 @@ is already bounded by $max_idle.

    %PARAM session_cache_status_update_time 600s

    How frequently the scache(8) server logs usage statistics with -session cache hit and miss rates for logical destinations and for +connection cache hit and miss rates for logical destinations and for physical endpoints.

    %PARAM remote_header_rewrite_domain diff --git a/postfix/src/global/mail_params.h b/postfix/src/global/mail_params.h index ab1844154..bc2e4e6a7 100644 --- a/postfix/src/global/mail_params.h +++ b/postfix/src/global/mail_params.h @@ -1836,15 +1836,15 @@ extern char *var_flush_service; /* * Session cache service. */ -#define VAR_SCACHE_SERVICE "session_cache_service" +#define VAR_SCACHE_SERVICE "connection_cache_service" #define DEF_SCACHE_SERVICE "scache" extern char *var_scache_service; -#define VAR_SCACHE_TTL_LIM "session_cache_ttl_limit" +#define VAR_SCACHE_TTL_LIM "connection_cache_ttl_limit" #define DEF_SCACHE_TTL_LIM "2s" extern int var_scache_ttl_lim; -#define VAR_SCACHE_STAT_TIME "session_cache_status_update_time" +#define VAR_SCACHE_STAT_TIME "connection_cache_status_update_time" #define DEF_SCACHE_STAT_TIME "600s" extern int var_scache_stat_time; diff --git a/postfix/src/global/mail_version.h b/postfix/src/global/mail_version.h index 42f75c0a6..791c85f61 100644 --- a/postfix/src/global/mail_version.h +++ b/postfix/src/global/mail_version.h @@ -20,7 +20,7 @@ * Patches change the patchlevel and the release date. Snapshots change the * release date only. */ -#define MAIL_RELEASE_DATE "20041023" +#define MAIL_RELEASE_DATE "20041030" #define MAIL_VERSION_NUMBER "2.2" #define VAR_MAIL_VERSION "mail_version" diff --git a/postfix/src/postfix/postfix.c b/postfix/src/postfix/postfix.c index c5ad8e643..4f8722297 100644 --- a/postfix/src/postfix/postfix.c +++ b/postfix/src/postfix/postfix.c @@ -195,7 +195,7 @@ /* proxymap(8), Postfix lookup table proxy server /* qmgr(8), Postfix queue manager /* qmqpd(8), Postfix QMQP server -/* scache(8), Postfix session cache manager +/* scache(8), Postfix connection cache manager /* showq(8), list Postfix mail queue /* smtp(8), Postfix SMTP client /* smtpd(8), Postfix SMTP server diff --git a/postfix/src/scache/scache.c b/postfix/src/scache/scache.c index 935d90d33..cbf9e4c24 100644 --- a/postfix/src/scache/scache.c +++ b/postfix/src/scache/scache.c @@ -2,44 +2,44 @@ /* NAME /* scache 8 /* SUMMARY -/* Postfix session cache server +/* Postfix connection cache server /* SYNOPSIS /* \fBscache\fR [generic Postfix daemon options] /* DESCRIPTION -/* The \fBscache\fR server maintains a shared multi-session +/* The \fBscache\fR server maintains a shared multi-connection /* cache. This information can be used by, for example, Postfix /* SMTP clients or other Postfix delivery agents. /* -/* The session cache is organized into logical destination -/* names, physical endpoint names, and sessions. +/* The connection cache is organized into logical destination +/* names, physical endpoint names, and connections. /* /* As a specific example, logical SMTP destinations specify /* (transport, domain, port), and physical SMTP endpoints -/* specify (transport, IP address, port). An SMTP session +/* specify (transport, IP address, port). An SMTP connection /* may be saved after a successful mail transaction. /* /* In the general case, one logical destination may refer to /* zero or more physical endpoints, one physical endpoint may /* be referenced by zero or more logical destinations, and -/* one endpoint may refer to zero or more sessions. +/* one endpoint may refer to zero or more connections. /* /* The exact syntax of a logical destination or endpoint name /* is application dependent; the \fBscache\fR service does -/* not care. A session is stored as a file descriptor together +/* not care. A connection is stored as a file descriptor together /* with application-dependent information that is needed to -/* re-activate a session object. Again, the \fBscache\fR +/* re-activate a connection object. Again, the \fBscache\fR /* service is completely unaware about the details of that /* information. /* /* All information is stored with a finite time to live (ttl). -/* The session cache daemon terminates when no client is +/* The connection cache daemon terminates when no client is /* connected for \fBmax_idle\fR time units. /* /* This server implements the following requests: /* .IP "\fBsave_endp\fI ttl endpoint endpoint_properties file_descriptor\fR" -/* Save the specified file descriptor and session property data +/* Save the specified file descriptor and connection property data /* under the specified endpoint name. The endpoint properties -/* are used by the client to re-activate a passivated session +/* are used by the client to re-activate a passivated connection /* object. /* .IP "\fBfind_endp\fI endpoint\fR" /* Look up cached properties and a cached file descriptor for the @@ -47,8 +47,8 @@ /* .IP "\fBsave_dest\fI ttl destination destination_properties endpoint\fR" /* Save the binding between a logical destination and an /* endpoint under the destination name, together with destination -/* specific session properties. The destination properties -/* are used by the client to re-activate a passivated session +/* specific connection properties. The destination properties +/* are used by the client to re-activate a passivated connection /* object. /* .IP "\fBfind_dest\fI destination\fR" /* Look up cached destination properties, cached endpoint properties, @@ -56,18 +56,18 @@ /* SECURITY /* .ad /* .fi -/* The session cache server is not security-sensitive. It does not +/* The connection cache server is not security-sensitive. It does not /* talk to the network, and it does not talk to local users. /* The scache server can run chrooted at fixed low privilege. /* -/* The session cache server is not a trusted process. It must +/* The connection cache server is not a trusted process. It must /* not be used to store information that is security sensitive. /* DIAGNOSTICS /* Problems and transactions are logged to \fBsyslogd\fR(8). /* BUGS /* Sessions cannot be cached across multiple machines. /* -/* When a session expires from the cache it is closed without +/* When a connection expires from the cache it is closed without /* protocol specific handshake. /* CONFIGURATION PARAMETERS /* .ad @@ -81,12 +81,12 @@ /* RESOURCE CONTROLS /* .ad /* .fi -/* .IP "\fBsession_cache_ttl_limit (2s)\fR" -/* The maximal time-to-live value that the session cache server +/* .IP "\fBconnection_cache_ttl_limit (2s)\fR" +/* The maximal time-to-live value that the connection cache server /* allows. -/* .IP "\fBsession_cache_status_update_time (600s)\fR" +/* .IP "\fBconnection_cache_status_update_time (600s)\fR" /* How frequently the scache(8) server logs usage statistics with -/* session cache hit and miss rates for logical destinations and for +/* connection cache hit and miss rates for logical destinations and for /* physical endpoints. /* MISCELLANEOUS CONTROLS /* .ad @@ -252,7 +252,7 @@ static void scache_save_endp_service(VSTREAM *client_stream) } } -/* scache_find_endp_service - protocol to find session for endpoint */ +/* scache_find_endp_service - protocol to find connection for endpoint */ static void scache_find_endp_service(VSTREAM *client_stream) { @@ -335,7 +335,7 @@ static void scache_save_dest_service(VSTREAM *client_stream) } } -/* scache_find_dest_service - protocol to find session for destination */ +/* scache_find_dest_service - protocol to find connection for destination */ static void scache_find_dest_service(VSTREAM *client_stream) { @@ -450,7 +450,7 @@ static void scache_status_dump(char *unused_name, char **unused_argv) scache_endp_hits = scache_endp_miss = 0; } if (scache_dest_count || scache_endp_count || scache_sess_count) { - msg_info("statistics: max simultaneous domains=%d addresses=%d sessions=%d", + msg_info("statistics: max simultaneous domains=%d addresses=%d connection=%d", scache_dest_count, scache_endp_count, scache_sess_count); scache_dest_count = 0; scache_endp_count = 0; diff --git a/postfix/src/smtp/smtp.c b/postfix/src/smtp/smtp.c index 4abbeb185..63a878a1a 100644 --- a/postfix/src/smtp/smtp.c +++ b/postfix/src/smtp/smtp.c @@ -26,11 +26,11 @@ /* to a recoverable error condition, the SMTP client will try to /* deliver the mail to an alternate host. /* -/* After a successful mail transaction, a session may be saved -/* to the \fBscache(8)\fR session cache server, so that it +/* After a successful mail transaction, a connection may be saved +/* to the \fBscache(8)\fR connection cache server, so that it /* may be used by any SMTP client for a subsequent transaction. /* -/* By default, session caching is enabled temporarily for +/* By default, connection caching is enabled temporarily for /* destinations that have a high volume of mail in the active /* queue. Session caching can be enabled permanently for /* specific destinations. @@ -60,11 +60,11 @@ /* the postmaster is notified of bounces, protocol problems, and of /* other trouble. /* BUGS -/* SMTP session caching does not work with TLS. The necessary +/* SMTP connection caching does not work with TLS. The necessary /* support for TLS object passivation and re-activation does not /* exist without closing the session, which defeats the purpose. /* -/* SMTP session caching assumes that SASL credentials are valid for +/* SMTP connection caching assumes that SASL credentials are valid for /* all destinations that map onto the same IP address and TCP port. /* CONFIGURATION PARAMETERS /* .ad @@ -195,13 +195,13 @@ /* Permanently enable SMTP connection caching for the specified /* destinations. /* .IP "\fBsmtp_connection_cache_on_demand (yes)\fR" -/* Temporarily enable SMTP session caching while a destination +/* Temporarily enable SMTP connection caching while a destination /* has a high volume of mail in the active queue. /* .IP "\fBsmtp_connection_cache_reuse_limit (10)\fR" -/* When SMTP session caching is enabled, the number of times that +/* When SMTP connection caching is enabled, the number of times that /* an SMTP session is reused before it is closed. /* .IP "\fBsmtp_connection_cache_time_limit (2s)\fR" -/* When SMTP session caching is enabled, the amount of time that +/* When SMTP connection caching is enabled, the amount of time that /* an unused SMTP client socket is kept open before it is closed. /* TROUBLE SHOOTING CONTROLS /* .ad @@ -273,7 +273,7 @@ /* SEE ALSO /* qmgr(8), queue manager /* bounce(8), delivery status reports -/* scache(8), session cache server +/* scache(8), connection cache server /* postconf(5), configuration parameters /* master(8), process manager /* syslogd(8), system logging