lock_file.c: close(2) file descriptor on failure, avoiding leak.

[nmh] / etc / mts.conf.in

diff --git a/etc/mts.conf.in b/etc/mts.conf.in
index 7cb0a4d88406e76d41f4dd6c47e5ef939f167a1a..0e20f289a32110a4bc2b55d63496409988088ce3 100644 (file)
--- a/etc/mts.conf.in
+++ b/etc/mts.conf.in
@@ -5,14 +5,14 @@
 #
 
 # The delivery method to use, which must be one of the following:
-# smtp:     nmh opens a socket connection to the appropriate port
-#           on the servers listed below and speaks SMTP to the
-#           first one that responds.  This is the default.
-# sendmail: nmh pipes messages directly to the sendmail program,
-#           speaking SMTP.
-# pipe:     nmh pipes messages directly to the sendmail program,
-#           using the -t option so that addresses are retrieved
-#           from the message.
+# smtp:          nmh opens a socket connection to the appropriate port
+#                on the servers listed below and speaks SMTP to the
+#                first one that responds.  This is the default.
+# sendmail/smtp: nmh pipes messages directly to the sendmail program,
+#                speaking SMTP.  Can be abbreviated to "sendmail".
+# sendmail/pipe: nmh pipes messages directly to the sendmail program,
+#                using the -t option so that addresses are retrieved
+#                from the message.
 mts: %mts%
 
 # Name that nmh considers `local'.  If not set, nmh will
@@ -27,8 +27,24 @@ mmdfldir: %mailspool%
 # are kept.  If this is empty, the user's login name is used.
 mmdflfil:
 
+#
+# The locking algorithm to use on the spool file.  Valid settings are:
+#
+#   fcntl      Locking using the fcntl() function
+#   dot                "Dot" locking using an external lock file
+#   flock      Locking using the flock() function (if supported by OS)
+#   lockf      Locking using the lockf() function (if supported by OS)
+#
+# Locking algorithms supported on this installation are:
+#
+#      %supported_locks%
+#
+# The default spool locking configured on this system is %default_locking%;
+# change the line below to get a different value
+#spoollocking: %default_locking%
+
 # Hardcoded POP server name (prevents inc'ing from local mail spool).
 #pophost: localhost
 
-# List of smtp servers to try if using smtp support
-servers: %smtpservers%
+# A SINGLE SMTP server to use when using SMTP support
+servers: %smtpserver%