sbr/mts.c: Delete mmdlm2; use same-valued mmdlm1 instead.

[nmh] / mts / smtp / smtp.c

diff --git a/mts/smtp/smtp.c b/mts/smtp/smtp.c
index c8bea5b86fbb792514474264bcd12cab505900aa..b09fde33cc9ff98ce4632a78149a28fc98999e6b 100644 (file)
--- a/mts/smtp/smtp.c
+++ b/mts/smtp/smtp.c
@@ -1,5 +1,4 @@
-/*
- * smtp.c -- nmh SMTP interface
+/* smtp.c -- nmh SMTP interface

  *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
  *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for


@@ -42,20 +41,16 @@
 
 #define        NBITS ((sizeof (int)) * 8)
 
 
 #define        NBITS ((sizeof (int)) * 8)
 

-/*
- * these codes must all be different!
- */
+/* Timeout in seconds for SMTP commands.
+ * Lore has it they must be distinct. */

 #define        SM_OPEN  300      /* Changed to 5 minutes to comply with a SHOULD in RFC 1123 */
 #define        SM_HELO  20
 #define        SM_RSET  15
 #define        SM_MAIL  301      /* changed to 5 minutes and a second (for uniqueness), see above */
 #define        SM_RCPT  302      /* see above */
 #define        SM_DATA  120      /* see above */
 #define        SM_OPEN  300      /* Changed to 5 minutes to comply with a SHOULD in RFC 1123 */
 #define        SM_HELO  20
 #define        SM_RSET  15
 #define        SM_MAIL  301      /* changed to 5 minutes and a second (for uniqueness), see above */
 #define        SM_RCPT  302      /* see above */
 #define        SM_DATA  120      /* see above */

-#define        SM_TEXT 180     /* see above */

 #define        SM_DOT  600     /* see above */
 #define        SM_QUIT  30
 #define        SM_DOT  600     /* see above */
 #define        SM_QUIT  30

-#define        SM_CLOS  10
-#define        SM_AUTH  45

 
 static int sm_addrs = 0;
 static int sm_child = NOTOK;
 
 static int sm_addrs = 0;
 static int sm_child = NOTOK;


@@ -498,7 +493,7 @@ sm_wadr (char *mbox, char *host, char *path)
 {
     switch (smtalk (SM_RCPT, host && *host ? "RCPT TO:<%s%s@%s>"
                                           : "RCPT TO:<%s%s>",
 {
     switch (smtalk (SM_RCPT, host && *host ? "RCPT TO:<%s%s@%s>"
                                           : "RCPT TO:<%s%s>",

-                            path ? path : "", mbox, host)) {
+                            FENDNULL(path), mbox, host)) {

        case 250: 
        case 251: 
            sm_addrs++;
        case 250: 
        case 251: 
            sm_addrs++;