--- sendmail-8.14.8/sendmail/sendmail.8.orig	Fri Nov 22 21:51:56 2013
+++ sendmail-8.14.8/sendmail/sendmail.8	Tue Apr  1 19:22:45 2014
@@ -16,19 +25,26 @@
 sendmail
 \- an electronic mail transport agent
 .SH SYNOPSIS
-.B sendmail
-.RI [ flags "] [" "address ..." ]
-.br
+.LP
+.nf
+\fBsendmail\fR [\fB-Ac\fR] [\fB-Am\fR] [\fB-ba\fR] [\fB-bD\fR] [\fB-bd\fR] [\fB-bH\fR] [\fB-bh\fR] [\fB-bi\fR] [\fB-bl\fR]
+    [\fB-bm\fR] [\fB-bp\fR] [\fB-bP\fR] [\fB-bs\fR] [\fB-bt\fR] [\fB-bv\fR] [\fB-B\fR \fItype\fR] [\fB-C\fR \fIfile\fR]
+    [\fB-D\fR \fIlogfile\fR] [\fB-d\fR \fIcategory.level\fR] [\fB-F\fR \fIfullname\fR] [\fB-f\fR \fIname\fR] [\fB-G\fR]
+    [\fB-h\fR \fIN\fR] [\fB-i\fR] [\fB-L \fItag\fR\fR] [\fB-N\fR \fInotifications\fR] [\fB-n\fR]
+    [\fB-O\fR \fIoption\fR=\fIvalue\fR] [\fB-o\fR x\fIvalue\fR] [\fB-p\fR \fIprotocol\fR]
+    [\fB-Q\fR [\fIreason\fR]] [\fB-q\fR [\fItime\fR]] [\fB-qf\fR] [\fB-qL\fR] [\fB-q G\fR\fIname\fR] [\fB-q\fR [\fB!\fR]{\fBI\fR|\fBQ\fR|\fBR\fR|\fBS\fR}\fIstr\fR]
+    [\fB-R\fR \fIret\fR] [\fB-r\fR \fIname\fR] [\fB-t\fR] [\fB-V\fR \fIenvid\fR] [\fB-v\fR] [\fB-X\fR \fIlogfile\fR]
+    [\fIaddress\fR]...
+.fi
+.LP
 .B newaliases
-.br
-.B mailq
-.RB [ \-v ]
-.br
+.LP
+\fBmailq\fR [\fB-v\fR]
+.LP
 .B hoststat
-.br
+.LP
 .B purgestat
-.br
-.B smtpd
+
 .SH DESCRIPTION
 .B Sendmail
 sends a message to one or more
@@ -65,8 +81,94 @@
 if `john' sends to `group', 
 and `group' includes `john' in the expansion, 
 then the letter will also be delivered to `john'.
-.SS Parameters
+
+.SS "Service Management"
+.LP
+The \fBsendmail\fR service is managed by the service management facility,
+\fBsmf\fR(6), under the service identifiers:
+
+.in +2
+.nf
+svc:/network/smtp:sendmail
+svc:/network/sendmail-client:default
+.fi
+.in -2
+
+.LP
+Administrative actions on these services, such as enabling, disabling, or
+requesting restart, can be performed using \fBsvcadm\fR(1M). The services'
+status can be queried using the \fBsvcs\fR(1) command. 
+.LP
+These are separate services rather than instances of the same service so that
+other services can properly express any dependencies. In particular, here are
+some guidelines about which service/instance should be depended on for which
+purposes:
+.RS +4
 .TP
+.ie t \(bu
+.el o
+For a service that uses \fBsendmail\fR to send mail, an optional dependency on
+the service \fBsvc:/network/sendmail-client\fR might be in order.
+.RE
+.RS +4
+.TP
+.ie t \(bu
+.el o
+For a service that needs to receive mail in general, but does not depend on
+\fBsendmail\fR being the particular SMTP receiver, a dependency on the service
+\fBsvc:/network/smtp\fR might be in order.
+.RE
+.RS +4
+.TP
+.ie t \(bu
+.el o
+For a service that needs to interact with sendmail in particular, such as a
+\fBMilter\fR, a dependency on the instance \fBsvc:/network/smtp:sendmail\fR
+might be in order.
+.RE
+.LP
+For the last two, note the difference, as the latter has the \fB":sendmail"\fR
+instance specification, whereas the former does not, thus representing the more
+general service.
+
+.SS "Startup Options"
+.LP
+When a sendmail service gets startet, for historical reasons the file
+\fB/etc/default/sendmail\fR will be read to obtain additional options,
+which should be used when starting the \fBsendmail\fR daemon. This feature 
+is deprecated and may disappear in future releases - related options should be
+stored as service properties instead. Service properties, if set, take
+precendences over options stored in the mentioned file. For more details wrt.
+the formatting of that file and supported service properties/options see
+\fBsendmail\fR(5).
+
+.SS "Enabling Access to Remote Clients"
+.LP
+On an unmodified system, access to \fBsendmail\fR by remote clients is per
+default disabled, i.e. sendmail listens to loopback network interfaces, only.
+To instruct the service to let sendmail listen on other NICs as well, one needs
+to set the property \fBconfig/local_only\fR of the \fBsmtp:sendmail\fR service
+to \fBfalse\fR.  For more information see \fBsendmail\fR(5).
+
+.SS "Automated Rebuilding of Configuration Files"
+.LP
+See \fBsendmail\fR(5) for details on which service properties can be set to
+automate (re)building of configuration files when the service is started.
+Today most smart Administrators neither specify processing options 
+at the command line or persist these options as services properties nor edit
+sendmail configuration files (*.cf) manually. Instead they adjust the
+corresponding sendmail m4 configuration file (sendmail.mc for server,
+submit.mc for client) and let m4/the sendmail service create the corresponding
+sendmail cf file.
+
+.SS "Mail Filter API"
+.LP
+\fBsendmail\fR supports a mail filter API called "milter". For more
+information, see \fB/usr/include/libmilter/README\fR and http://www.milter.org
+
+
+.SH OPTIONS
+.TP
 .B \-Ac
 Use submit.cf even if the operation mode does not indicate
 an initial mail submission.
@@ -116,6 +218,9 @@
 .B \-bi
 Initialize the alias database.
 .TP
+.B \-bl
+Runs as a daemon (like \fB-bd\fR) but accepts only loopback SMTP connections.
+.TP
 .B \-bm
 Deliver mail in the usual way (default).
 .TP
@@ -316,6 +421,9 @@
 Process saved messages in the queue once and do not fork(),
 but run in the foreground.
 .TP
+\fB\-q\fRL
+Act on "lost" items in the mail queue.
+.TP
 \fB\-q\fRG\fIname\fR
 Process jobs in queue group called
 .I name
@@ -395,7 +503,7 @@
 .B \-\-
 Stop processing command flags and use the rest of the arguments as
 addresses.
-.SS Options
+.SS Processing Options
 There are also a number of processing options that may be set.
 Normally these will only be used by a system administrator.  
 Options may be set either on the command line 
@@ -409,18 +517,18 @@
 on the command line 
 and only shows the long names; 
 for a complete list (and details), consult the
-.IR "Sendmail Installation and Operation Guide" .
-The options are:
+.IR "Sendmail Installation and Operation Guide"[1],  
+Section 5.6 .  The options are:
 .TP
-.RI AliasFile= file
+.BI AliasFile= file
 Use alternate alias file.
 .TP
-HoldExpensive 
+.B HoldExpensive 
 On mailers that are considered ``expensive'' to connect to, 
 don't initiate immediate connection.  
 This requires queueing.
 .TP
-.RI CheckpointInterval= N
+.BI CheckpointInterval= N
 Checkpoint the queue file after every
 .I N
 successful deliveries (default 10).  
@@ -429,7 +537,7 @@
 interrupted by system crashes.
 .ne 1i
 .TP
-.RI DeliveryMode= x
+.BI DeliveryMode= x
 Set the delivery mode to
 .IR x .
 Delivery modes are 
@@ -446,7 +554,7 @@
 except that database lookups for maps which have set the \-D option
 (default for the host map) are avoided.
 .TP
-.RI ErrorMode= x
+.BI ErrorMode= x
 Set error processing to mode
 .IR x .
 Valid modes are 
@@ -476,42 +584,42 @@
 .I dead.letter
 in the sender's home directory.
 .TP
-SaveFromLine
+.B SaveFromLine
 Save
 UNIX-style
 From lines at the front of messages.
 .TP
-.RI MaxHopCount= N
+.BI MaxHopCount= N
 The maximum number of times a message is allowed to ``hop'' 
 before we decide it is in a loop.
 .TP
-IgnoreDots
+.B IgnoreDots
 Do not take dots on a line by themselves 
 as a message terminator.
 .TP
-SendMimeErrors
+.B SendMimeErrors
 Send error messages in MIME format.  
 If not set, the DSN (Delivery Status Notification) SMTP extension 
 is disabled.
 .TP
-.RI ConnectionCacheTimeout= timeout
+.BI ConnectionCacheTimeout= timeout
 Set connection cache timeout.
 .TP
-.RI ConnectionCacheSize= N
+.BI ConnectionCacheSize= N
 Set connection cache size.
 .TP
-.RI LogLevel= n
+.BI LogLevel= n
 The log level.
 .TP
-.RI MeToo= False
+.BI MeToo= False
 Don't send to ``me'' (the sender) if I am in an alias expansion.
 .TP
-CheckAliases
+.B CheckAliases
 Validate the right hand side of aliases during a
 newaliases(1)
 command.
 .TP
-OldStyleHeaders
+.B OldStyleHeaders
 If set, this message may have 
 old style headers.  
 If not set, 
@@ -520,13 +628,13 @@
 If set, an adaptive algorithm is used that will correctly 
 determine the header format in most cases.
 .TP
-.RI QueueDirectory= queuedir
+.BI QueueDirectory= queuedir
 Select the directory in which to queue messages.
 .TP
-.RI StatusFile= file
+.BI StatusFile= file
 Save statistics in the named file.
 .TP
-.RI Timeout.queuereturn= time
+.BI Timeout.queuereturn= time
 Set the timeout on undelivered messages in the queue to the specified time.  
 After delivery has failed 
 (e.g., because of a host being down) 
@@ -534,7 +642,7 @@
 failed messages will be returned to the sender.  
 The default is five days.
 .TP
-.RI UserDatabaseSpec= userdatabase
+.BI UserDatabaseSpec= userdatabase
 If set, a user database is consulted to get forwarding information.
 You can consider this an adjunct to the aliasing mechanism, 
 except that the database is intended to be distributed; 
@@ -543,14 +651,14 @@
 USERDB
 option compiled in.
 .TP
-ForkEachJob
+.B ForkEachJob
 Fork each job during queue runs.  
 May be convenient on memory-poor machines.
 .TP
-SevenBitInput
+.B SevenBitInput
 Strip incoming messages to seven bits.
 .TP
-.RI EightBitMode= mode
+.BI EightBitMode= mode
 Set the handling of eight bit input to seven bit destinations to
 .IR mode :
 m
@@ -561,14 +669,14 @@
 s
 (strict) will bounce the message.
 .TP
-.RI MinQueueAge= timeout
+.BI MinQueueAge= timeout
 Sets how long a job must ferment in the queue between attempts to send it.
 .TP
-.RI DefaultCharSet= charset
+.BI DefaultCharSet= charset
 Sets the default character set used to label 8-bit data 
 that is not otherwise labelled.
 .TP
-.RI DialDelay= sleeptime
+.BI DialDelay= sleeptime
 If opening a connection fails, 
 sleep for
 .I sleeptime
@@ -575,7 +683,7 @@
 seconds and try again.  
 Useful on dial-on-demand sites.
 .TP
-.RI NoRecipientAction= action
+.BI NoRecipientAction= action
 Set the behaviour when there are no recipient headers (To:, Cc: or
 Bcc:) in the message to
 .IR action :
@@ -591,14 +699,16 @@
 adds a header reading
 `To: undisclosed-recipients:;'.
 .TP
-.RI MaxDaemonChildren= N
+.BI MaxDaemonChildren= N
 Sets the maximum number of children that an incoming SMTP daemon
 will allow to spawn at any time to
 .IR N .
 .TP
-.RI ConnectionRateThrottle= N
+.BI ConnectionRateThrottle= N
 Sets the maximum number of connections per second to the SMTP port to
 .IR N .
+
+.SH USAGE
 .PP
 In aliases, 
 the first character of a name may be 
@@ -625,7 +735,14 @@
 would read
 .I /usr/local/lib/poets.list
 for the list of addresses making up the group.
-.PP
+
+.LP
+To check which features were used to compile sendmail and thus are available
+issue the following command:
+.IP
+sendmail -bv -d0.13 </dev/null
+
+.SH EXIT STATUS
 .B Sendmail
 returns an exit status 
 describing what it did.  
@@ -682,57 +799,89 @@
 will act as a daemon, as if the
 .B \-bd
 option were specified.
-.SH NOTES
-.B sendmail
-often gets blamed for many problems
-that are actually the result of other problems,
-such as overly permissive modes on directories.
-For this reason,
-.B sendmail
-checks the modes on system directories and files
-to determine if they can be trusted.
-Although these checks can be turned off
-and your system security reduced by setting the
-.BR DontBlameSendmail
-option,
-the permission problems should be fixed.
-For more information, see:
 
-.I http://www.sendmail.org/tips/DontBlameSendmail.html
+.SH ENVIRONMENT VARIABLES
+.LP
+No environment variables are used. However, sendmail's start-up script, invoked
+by \fBsvcadm\fR(8), reads \fB/etc/default/sendmail\fR. In this file, if the
+variable \fBETRN_HOSTS\fR is set, the start-up script parses this variable and
+invokes \fBetrn\fR(8) appropriately. \fBETRN_HOSTS\fR should be of the form:
+
+.in +2
+.nf
+"s1:c1.1,c1.2        s2:c2.1 s3:c3.1,c3.2,c3.3"
+.fi
+.in -2
+
+.LP
+That is, white-space separated groups of \fIserver:client\fR where \fIclient\fR
+can be one or more comma-separated names. The \fI:client\fR part is optional.
+\fIserver\fR is the name of the server to prod; a mail queue run is requested
+for each \fIclient\fR name. This is comparable to running:
+
+.in +2
+.nf
+/usr/lib/sendmail -qR \fIclient\fR
+.fi
+.in -2
+.LP
+on the host \fIserver\fR.
+
 .SH FILES
 Except for the file
-.I /etc/mail/sendmail.cf
+.B /etc/mail/sendmail.cf
+and
+.B /etc/mail/submit.cf
 itself the following pathnames are all specified in
-.IR /etc/mail/sendmail.cf .
+.BR /etc/mail/sendmail.cf .
 Thus, 
 these values are only approximations.
 .PP
 .TP
- /etc/mail/aliases
+.B /etc/mail/aliases
 raw data for alias names
 .TP
- /etc/mail/aliases.db
+\fB/etc/mail/aliases.db\fR  or  \fB/etc/mail/aliases.\fR{\fBdir\fR,\fBpag\fR}
 data base of alias names
 .TP
- /etc/mail/sendmail.cf
+\fB/etc/mail/sendmail.cf\fR  and  \fB/etc/mail/submit.cf\fR
 configuration file
 .TP
- /etc/mail/helpfile
+.B /etc/mail/helpfile
 help file
 .TP
- /etc/mail/statistics
+.B /var/log/sendmail.st
 collected statistics
 .TP
- /var/spool/mqueue/*
+\fB/var/spool/mqueue/\fR*  and  \fB/var/spool/clientmqueue/\fR*
 temp files
+.TP
+.B /etc/mail/trusted-users
+Lists users that are "trusted", that is, able to set their envelope from
+address using \fB-f\fR without generating a warning message. Note that this
+file is consulted by the default \fBsendmail.cf\fR, but not by the default
+\fBsubmit.cf\fR, in which the line referring to \fB/etc/mail/trusted-users\fR
+is commented out. See \fBsendmail\fR(5) for instructions on making changes to
+\fBsubmit.cf\fR and \fBsendmail.cf\fR.
+.TP
+.B ~/.forward
+List of recipients for forwarding messages.
+.TP
+.B /usr/include/libmilter/README
+Describes the steps needed to compile and run a filter.
+.TP
+.B /usr/share/doc/sendmail/op.pdf
+Sendmail Installation and Operation Guide.
+
 .SH SEE ALSO
-binmail(1),
-mail(1),
-rmail(1),
-syslog(3),
-aliases(5),
-mailaddr(7),
-rc(8)
+.LP
+\fBsvcs\fR(1), \fBbiff\fR(1B), \fBmail\fR(1), \fBmailq\fR(1), \fBmailx\fR(1),
+\fBnice\fR(1), \fBcheck-hostname\fR(8), \fBcheck-permissions\fR(8),
+\fBetrn\fR(8), \fBnewaliases\fR(8), \fBsvcadm\fR(1M), \fBsvccfg\fR(1M),
+\fBfork\fR(2), \fBgetpwnam\fR(3C), \fBgetusershell\fR(3C),
+\fBresolver\fR(3RESOLV), \fBaliases\fR(4), \fBhosts\fR(4), \fBsendmail\fR(4),
+\fBshells\fR(4), \fBattributes\fR(6), \fBlargefile\fR(6), \fBsmf\fR(6),
+\fBrandom\fR(7D)
 .PP
 DARPA 
 Internet Request For Comments
@@ -739,12 +888,71 @@
 .IR RFC819 ,
 .IR RFC821 ,
 .IR RFC822 .
-.IR "Sendmail Installation and Operation Guide" ,
-No. 8, SMM.
-.PP
+.LP
+\fIsendmail, Third Edition\fR, Bryan Costales with Eric Allman\fB\fR, O'Reilly
+& Associates, Inc., 2003.
+.LP
 http://www.sendmail.org/
-.PP
-US Patent Numbers 6865671, 6986037.
+.LP
+http://www.milter.org
+.IP "[1]"
+Sendmail Installation and Operation Guide, No. 8, SMM.
+.RS
+\%\%http://www.sendmail.com/pdfs/open_source/installation_and_op_guide.pdf
+.RE
+.IP "[2]"
+Sendmail Configuration Files
+.RS
+\%\%http://www.sendmail.com/sm/open_source/docs/configuration_readme/
+.RE
+
+.SH NOTES
+.LP
+The \fBsendmail\fR program requires a fully qualified host name when starting.
+A script has been included to help verify if the host name is defined properly
+(see \fBcheck-hostname\fR(8)).
+
+.LP
+.B sendmail
+often gets blamed for many problems
+that are actually the result of other problems,
+such as overly permissive modes on directories.
+For this reason,
+.B sendmail
+checks the modes on system directories and files
+to determine if they can be trusted.
+Although these checks can be turned off
+and your system security reduced by setting the
+.BR DontBlameSendmail
+option,
+the permission problems should be fixed.
+
+.LP
+E.g. access to \fB/etc/mail\fR and \fB/var/spool/mqueue\fR has been restricted.
+.LP
+Security restrictions have been placed users using \fB\&.forward\fR files to
+pipe mail to a program or redirect mail to a file. The default shell (as listed
+in \fB/etc/passwd\fR) of these users must be listed in \fBgetusershell\fR(3C).
+This restriction does not affect mail that is being redirected to another alias.
+.LP
+Additional restrictions have been put in place on \fB\&.forward\fR and
+\fB:include:\fR files. These files and the directory structure that they are
+placed in cannot be group- or world-writable. See \fBcheck-permissions\fR(8).
+.LP
+For more information, see:
+.I http://www.sendmail.org/tips/DontBlameSendmail.html
+
+.LP
+If you have interfaces that map to domains that have MX records that point to
+non-local destinations, you might need to enable the \fBDontProbeInterfaces\fR
+option to enable delivery to those destinations. In its default startup
+behavior, \fBsendmail\fR probes each interface and adds an interface's \fBIP\fR
+addresses, as well as any domains that those addresses map to, to its list of
+domains that are considered local. For domains thus added, being on the list of
+local domains is equivalent to having a 0-preference MX record, with
+\fBlocalhost\fR as the MX value. If this is not the result you want, enable
+\fBDontProbeInterfaces\fR.
+
 .SH HISTORY
 The
 .B sendmail
