Remove -queue support to post; it is now officially obsolete.

diff --git a/docs/pending-release-notes b/docs/pending-release-notes
index 6f19ee5..2107b3c 100644 (file)
--- a/docs/pending-release-notes
+++ b/docs/pending-release-notes
@@ -6,6 +6,10 @@ NEW FEATURES
 -----------------
 OBSOLETE FEATURES
 -----------------
 -----------------
 OBSOLETE FEATURES
 -----------------

+
+- The undocumented -queue switch to post was deprecated in nmh 1.6, and
+  removed in this release.
+

 -------------------
 DEPRECATED FEATURES
 -------------------
 -------------------
 DEPRECATED FEATURES
 -------------------

diff --git a/mts/smtp/smtp.c b/mts/smtp/smtp.c
index f415444..e6ac166 100644 (file)
--- a/mts/smtp/smtp.c
+++ b/mts/smtp/smtp.c
@@ -151,9 +151,9 @@ static char *EHLOkeys[MAXEHLO + 1];
 /*
  * static prototypes
  */
 /*
  * static prototypes
  */

-static int smtp_init (char *, char *, char *, int, int, int, int, int, int,
+static int smtp_init (char *, char *, char *, int, int, int, int, int,

                      char *, char *, int);
                      char *, char *, int);

-static int sendmail_init (char *, char *, int, int, int, int, int, int,
+static int sendmail_init (char *, char *, int, int, int, int, int,

                           char *, char *);
 
 static int rclient (char *, char *);
                           char *, char *);
 
 static int rclient (char *, char *);


@@ -183,22 +183,19 @@ static int sm_auth_sasl(char *, int, char *, char *);
 
 int
 sm_init (char *client, char *server, char *port, int watch, int verbose,
 
 int
 sm_init (char *client, char *server, char *port, int watch, int verbose,

-         int debug, int queued, int sasl, int saslssf,
-        char *saslmech, char *user, int tls)
+         int debug, int sasl, int saslssf, char *saslmech, char *user, int tls)

 {
     if (sm_mts == MTS_SMTP)
        return smtp_init (client, server, port, watch, verbose,
 {
     if (sm_mts == MTS_SMTP)
        return smtp_init (client, server, port, watch, verbose,

-                         debug, queued, sasl, saslssf, saslmech,
-                         user, tls);
+                         debug, sasl, saslssf, saslmech, user, tls);

     else
        return sendmail_init (client, server, watch, verbose,
     else
        return sendmail_init (client, server, watch, verbose,

-                              debug, queued, sasl, saslssf, saslmech,
-                             user);
+                              debug, sasl, saslssf, saslmech, user);

 }
 
 static int
 smtp_init (char *client, char *server, char *port, int watch, int verbose,
 }
 
 static int
 smtp_init (char *client, char *server, char *port, int watch, int verbose,

-          int debug, int queued,
+          int debug,

            int sasl, int saslssf, char *saslmech, char *user, int tls)
 {
     int result, sd1, sd2;
            int sasl, int saslssf, char *saslmech, char *user, int tls)
 {
     int result, sd1, sd2;


@@ -387,16 +384,13 @@ smtp_init (char *client, char *server, char *port, int watch, int verbose,
 send_options: ;
     if (watch && EHLOset ("XVRB"))
        smtalk (SM_HELO, "VERB on");
 send_options: ;
     if (watch && EHLOset ("XVRB"))
        smtalk (SM_HELO, "VERB on");

-    if (queued && EHLOset ("XQUE"))
-       smtalk (SM_HELO, "QUED");

 
     return RP_OK;
 }
 
 int
 sendmail_init (char *client, char *server, int watch, int verbose,
 
     return RP_OK;
 }
 
 int
 sendmail_init (char *client, char *server, int watch, int verbose,

-               int debug, int queued,
-               int sasl, int saslssf, char *saslmech, char *user)
+               int debug, int sasl, int saslssf, char *saslmech, char *user)

 {
     unsigned int i, result, vecp;
     int pdi[2], pdo[2];
 {
     unsigned int i, result, vecp;
     int pdi[2], pdo[2];


@@ -472,7 +466,7 @@ sendmail_init (char *client, char *server, int watch, int verbose,
            vecp = 0;
            vec[vecp++] = r1bindex (sendmail, '/');
            vec[vecp++] = "-bs";
            vecp = 0;
            vec[vecp++] = r1bindex (sendmail, '/');
            vec[vecp++] = "-bs";

-           vec[vecp++] = watch ? "-odi" : queued ? "-odq" : "-odb";
+           vec[vecp++] = watch ? "-odi" : "-odb";

            vec[vecp++] = "-oem";
            vec[vecp++] = "-om";
            if (verbose)
            vec[vecp++] = "-oem";
            vec[vecp++] = "-om";
            if (verbose)

diff --git a/mts/smtp/smtp.h b/mts/smtp/smtp.h
index ae5bfdc..72caacc 100644 (file)
--- a/mts/smtp/smtp.h
+++ b/mts/smtp/smtp.h
@@ -16,7 +16,7 @@ struct smtp {
  * prototypes
  */
 /* int client (); */
  * prototypes
  */
 /* int client (); */

-int sm_init (char *, char *, char *, int, int, int, int, int, int, char *, char *, int);
+int sm_init (char *, char *, char *, int, int, int, int, int, char *, char *, int);

 int sm_winit (char *);
 int sm_wadr (char *, char *, char *);
 int sm_waend (void);
 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 8cfcf65..b940ac3 100644 (file)
--- a/uip/post.c
+++ b/uip/post.c
@@ -76,7 +76,6 @@
     X("server host", 6, SERVSW) /* specify alternate SMTP server */ \
     X("snoop", -5, SNOOPSW) /* snoop the SMTP transaction */ \
     X("partno", -6, PARTSW) \
     X("server host", 6, SERVSW) /* specify alternate SMTP server */ \
     X("snoop", -5, SNOOPSW) /* snoop the SMTP transaction */ \
     X("partno", -6, PARTSW) \

-    X("queued", -6, QUEUESW) \

     X("sasl", SASLminc(-4), SASLSW) \
     X("nosasl", SASLminc(-6), NOSASLSW) \
     X("saslmaxssf", SASLminc(-10), SASLMXSSFSW) \
     X("sasl", SASLminc(-4), SASLSW) \
     X("nosasl", SASLminc(-6), NOSASLSW) \
     X("saslmaxssf", SASLminc(-10), SASLMXSSFSW) \


@@ -241,7 +240,6 @@ static char *serversw = NULL;
 static char prefix[] = "----- =_aaaaaaaaaa";
 
 static char *partno = NULL;
 static char prefix[] = "----- =_aaaaaaaaaa";
 
 static char *partno = NULL;

-static int queued = 0;

 
 /*
  * static prototypes
 
 /*
  * static prototypes


@@ -422,10 +420,6 @@ main (int argc, char **argv)
                        adios (NULL, "missing argument to %s", argp[-2]);
                    continue;
 
                        adios (NULL, "missing argument to %s", argp[-2]);
                    continue;
 

-               case QUEUESW:
-                   queued++;
-                   continue;
-               

                case SASLSW:
                    sasl++;
                    continue;
                case SASLSW:
                    sasl++;
                    continue;


@@ -1526,8 +1520,8 @@ post (char *file, int bccque, int talk, char *envelope)
        }
     } else {
         if (rp_isbad (retval = sm_init (clientsw, serversw, port, watch,
        }
     } else {
         if (rp_isbad (retval = sm_init (clientsw, serversw, port, watch,

-                                        verbose, snoop, queued, sasl,
-                                        saslssf, saslmech, user, tls))  ||
+                                        verbose, snoop, sasl, saslssf,
+                                       saslmech, user, tls))  ||

             rp_isbad (retval = sm_winit (envelope)))
            die (NULL, "problem initializing server; %s", rp_string (retval));
 
             rp_isbad (retval = sm_winit (envelope)))
            die (NULL, "problem initializing server; %s", rp_string (retval));
 


@@ -1566,8 +1560,8 @@ verify_all_addresses (int talk, char *envelope)
 
     if (!whomsw || checksw)
        if (rp_isbad (retval = sm_init (clientsw, serversw, port, watch,
 
     if (!whomsw || checksw)
        if (rp_isbad (retval = sm_init (clientsw, serversw, port, watch,

-                                       verbose, snoop, queued, sasl,
-                                       saslssf, saslmech, user, tls))
+                                       verbose, snoop, sasl, saslssf,
+                                       saslmech, user, tls))

                || rp_isbad (retval = sm_winit (envelope)))
            die (NULL, "problem initializing server; %s", rp_string (retval));
 
                || rp_isbad (retval = sm_winit (envelope)))
            die (NULL, "problem initializing server; %s", rp_string (retval));