From: David Levine <levinedl@acm.org>
Date: Tue, 10 Jul 2012 00:47:47 +0000 (-0500)
Subject: Removed use of the ONEX sendmail verb.  It is obsolete,
X-Git-Url: http://git.marmaro.de/?a=commitdiff_plain;h=704bdde497da69854846d51d86c440fc980c5489;p=mmh

Removed use of the ONEX sendmail verb.  It is obsolete,
according to http://smtpfilter.sourceforge.net/esmtp.html.
And was removed over 10 years ago from sendmail (8.12),
according to http://www.irbs.net/internet/postfix/0111/2237.html.
---

diff --git a/mts/smtp/smtp.c b/mts/smtp/smtp.c
index 00df119..adfa580 100644
--- a/mts/smtp/smtp.c
+++ b/mts/smtp/smtp.c
@@ -147,9 +147,9 @@ char *EHLOkeys[MAXEHLO + 1];
  * static prototypes
  */
 static int smtp_init (char *, char *, char *, int, int, int, int, int, int,
-		      int, char *, char *, int);
+		      char *, char *, int);
 static int sendmail_init (char *, char *, int, int, int, int, int, int,
-                          int, char *, char *);
+                          char *, char *);
 
 static int rclient (char *, char *);
 static int sm_ierror (char *fmt, ...);
@@ -178,22 +178,22 @@ static int sm_auth_sasl(char *, int, char *, char *);
 
 int
 sm_init (char *client, char *server, char *port, int watch, int verbose,
-         int debug, int onex, int queued, int sasl, int saslssf,
+         int debug, int queued, int sasl, int saslssf,
 	 char *saslmech, char *user, int tls)
 {
     if (sm_mts == MTS_SMTP)
 	return smtp_init (client, server, port, watch, verbose,
-			  debug, onex, queued, sasl, saslssf, saslmech,
+			  debug, queued, sasl, saslssf, saslmech,
 			  user, tls);
     else
 	return sendmail_init (client, server, watch, verbose,
-                              debug, onex, queued, sasl, saslssf, saslmech,
+                              debug, queued, sasl, saslssf, saslmech,
 			      user);
 }
 
 static int
 smtp_init (char *client, char *server, char *port, int watch, int verbose,
-	   int debug, int onex, int queued,
+	   int debug, int queued,
            int sasl, int saslssf, char *saslmech, char *user, int tls)
 {
     int result, sd1, sd2;
@@ -441,8 +441,6 @@ smtp_init (char *client, char *server, char *port, int watch, int verbose,
 send_options: ;
     if (watch && EHLOset ("XVRB"))
 	smtalk (SM_HELO, "VERB on");
-    if (onex && EHLOset ("XONE"))
-	smtalk (SM_HELO, "ONEX");
     if (queued && EHLOset ("XQUE"))
 	smtalk (SM_HELO, "QUED");
 
@@ -451,7 +449,7 @@ send_options: ;
 
 int
 sendmail_init (char *client, char *server, int watch, int verbose,
-               int debug, int onex, int queued,
+               int debug, int queued,
                int sasl, int saslssf, char *saslmech, char *user)
 {
     unsigned int i, result, vecp;
@@ -615,8 +613,6 @@ sendmail_init (char *client, char *server, int watch, int verbose,
     }
 #endif /* CYRUS_SASL */
 
-	    if (onex)
-		smtalk (SM_HELO, "ONEX");
 	    if (watch)
 		smtalk (SM_HELO, "VERB on");
 
diff --git a/mts/smtp/smtp.h b/mts/smtp/smtp.h
index de4abaa..ae5bfdc 100644
--- a/mts/smtp/smtp.h
+++ b/mts/smtp/smtp.h
@@ -16,7 +16,7 @@ struct smtp {
  * prototypes
  */
 /* int client (); */
-int sm_init (char *, char *, char *, int, int, int, int, int, int, int, char *, char *, int);
+int sm_init (char *, char *, char *, int, int, int, int, int, int, char *, char *, int);
 int sm_winit (char *);
 int sm_wadr (char *, char *, char *);
 int sm_waend (void);
diff --git a/uip/post.c b/uip/post.c
index 08c62eb..cc44a1d 100644
--- a/uip/post.c
+++ b/uip/post.c
@@ -1472,11 +1472,10 @@ do_addresses (int bccque, int talk)
 static void
 post (char *file, int bccque, int talk, char *envelope)
 {
-    int fd, onex;
+    int fd;
     int	retval, i;
     pid_t child_id;
 
-    onex = !(msgflags & MINV) || bccque;
     if (verbose) {
 	if (msgflags & MINV)
 	    printf (" -- Posting for %s Recipients --\n",
@@ -1521,7 +1520,7 @@ post (char *file, int bccque, int talk, char *envelope)
 	}
     } else {
         if (rp_isbad (retval = sm_init (clientsw, serversw, port, watch,
-                                        verbose, snoop, onex, queued, sasl,
+                                        verbose, snoop, queued, sasl,
                                         saslssf, saslmech, user, tls))  ||
             rp_isbad (retval = sm_winit (envelope)))
 	    die (NULL, "problem initializing server; %s", rp_string (retval));
@@ -1533,7 +1532,7 @@ post (char *file, int bccque, int talk, char *envelope)
         close (fd);
         fflush (stdout);
 
-        sm_end (onex ? OK : DONE);
+        sm_end (OK);
         sigoff ();
 
         if (verbose) {
@@ -1561,7 +1560,7 @@ verify_all_addresses (int talk, char *envelope)
 
     if (!whomsw || checksw)
 	if (rp_isbad (retval = sm_init (clientsw, serversw, port, watch,
-					verbose, snoop, 0, queued, sasl,
+					verbose, snoop, queued, sasl,
 					saslssf, saslmech, user, tls))
 		|| rp_isbad (retval = sm_winit (envelope)))
 	    die (NULL, "problem initializing server; %s", rp_string (retval));