Import sendmail 8.12.11

5 files changed, 31 insertions, 7 deletions

diff --git a/contrib/sendmail/libmilter/docs/smfi_addrcpt.html b/contrib/sendmail/libmilter/docs/smfi_addrcpt.html
index 3b2eb56..16f86c9 100644
--- a/contrib/sendmail/libmilter/docs/smfi_addrcpt.html
+++ b/contrib/sendmail/libmilter/docs/smfi_addrcpt.html
@@ -48,7 +48,7 @@ Add a recipient for the current message.
 
 <td>smfi_addrcpt will fail and return MI_FAILURE if:
 <ul><li>rcpt is NULL.
-    <li>Adding headers in the current connection state is invalid.
+    <li>Adding recipients in the current connection state is invalid.
     <li>A network error occurs.
     <li>SMFIF_ADDRCPT was not set when <a href="smfi_register.html">smfi_register</a> was called.
 </ul>
diff --git a/contrib/sendmail/libmilter/docs/smfi_delrcpt.html b/contrib/sendmail/libmilter/docs/smfi_delrcpt.html
index 451f36a..9608e61 100644
--- a/contrib/sendmail/libmilter/docs/smfi_delrcpt.html
+++ b/contrib/sendmail/libmilter/docs/smfi_delrcpt.html
@@ -49,7 +49,7 @@ Remove a recipient from the current message's envelope.
 <td>smfi_delrcpt will fail and return MI_FAILURE if:
 <ul>
     <li>rcpt is NULL.
-    <li>Adding headers in the current connection state is invalid.
+    <li>Deleting recipients in the current connection state is invalid.
     <li>A network error occurs.
     <li>SMFIF_DELRCPT was not set when <a href="smfi_register.html">smfi_register</a> was called.
 </ul>
diff --git a/contrib/sendmail/libmilter/docs/smfi_setreply.html b/contrib/sendmail/libmilter/docs/smfi_setreply.html
index 646a8f1..d5b0e24 100644
--- a/contrib/sendmail/libmilter/docs/smfi_setreply.html
+++ b/contrib/sendmail/libmilter/docs/smfi_setreply.html
@@ -75,6 +75,12 @@ Otherwise, it return MI_SUCCESS.
 <td>
 <ul>
 <li>Values passed to smfi_setreply are not checked for standards compliance.
+<li>The message parameter should contain only printable characters,
+other characters may lead to undefined behavior.
+For example, CR or LF will cause the call to fail,
+single '%' characters will cause the text to be ignored
+(if there really should be a '%' in the string,
+use '%%' just like for <tt>printf(3)</tt>).
 <li>For details about reply codes and their meanings, please see RFC's 
 <a href="http://www.rfc-editor.org/rfc/rfc821.txt">821</a>/
 <a href="http://www.rfc-editor.org/rfc/rfc2821.txt">2821</a>
diff --git a/contrib/sendmail/libmilter/docs/xxfi_connect.html b/contrib/sendmail/libmilter/docs/xxfi_connect.html
index af58bf9..85d02e4 100644
--- a/contrib/sendmail/libmilter/docs/xxfi_connect.html
+++ b/contrib/sendmail/libmilter/docs/xxfi_connect.html
@@ -62,11 +62,29 @@ is passed to smfi_register().
 <td><table border="1" cellspacing=0>
   <tr bgcolor="#dddddd"><th>Return value</th><th>Description</th></tr>
   <tr valign="top">
-     <td>SMFIS_DISCARD</td>
-     <td>Not meaningful, as
-        this is only meaningful from message-oriented routines.
+     <td>SMFIS_ACCEPT</td>
+     <td>Accept all commands and messages from this client without any
+         further contact with the filter. </td>
      </td>
   </tr>
+  <tr valign="top">
+     <td>SMFIS_CONTINUE</td>
+     <td>Continue normal processing. </td>
+  </tr>
+  <tr valign="top">
+     <td>SMFIS_DISCARD</td>
+     <td>Undefined behaviour; do not use. </td>
+  </tr>
+  <tr valign="top">
+     <td>SMFIS_TEMPFAIL</td>
+     <td>Reject all commands and messages from this client with a
+         temporary failure reply code. </td>
+  </tr>
+  <tr valign="top">
+     <td>SMFIS_REJECT</td>
+     <td>Reject all commands and messages from this client with a
+         permanent failure reply code. </td>
+  </tr>
 </table>
 </tr>
 -->
diff --git a/contrib/sendmail/libmilter/docs/xxfi_envrcpt.html b/contrib/sendmail/libmilter/docs/xxfi_envrcpt.html
index 9d32e90..a96ac95 100644
--- a/contrib/sendmail/libmilter/docs/xxfi_envrcpt.html
+++ b/contrib/sendmail/libmilter/docs/xxfi_envrcpt.html
@@ -52,12 +52,12 @@ Handle the envelope RCPT command.
   <tr valign="top">
      <td>SMFIS_TEMPFAIL</td>
      <td>Temporarily fail for this particular recipient; further recipients 
-     maystill be sent.  <a href="xxfi_abort.html">xxfi_abort</a> is not called.
+     may still be sent.  <a href="xxfi_abort.html">xxfi_abort</a> is not called.
      </td>
   </tr>
   <tr valign="top">
      <td>SMFIS_REJECT</td>
-     <td>Reject this particular recipient; further recipients maystill be sent.
+     <td>Reject this particular recipient; further recipients may still be sent.
      <a href="xxfi_abort.html">xxfi_abort</a> is not called.
      </td>
   </tr>