Revert "Default to enabling (Cyrus) SASL, if available."

[nmh] / uip / post.c

diff --git a/uip/post.c b/uip/post.c
index 9b358521c97afe13e3f03f21b41a4eb1a83fbe3b..ef9c88032b50de1cba18571346edafdb9ae8b8e4 100644 (file)
--- a/uip/post.c
+++ b/uip/post.c
@@ -76,13 +76,12 @@
     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("saslmech", SASLminc(-5), SASLMECHSW) \
     X("user", SASLminc(-4), USERSW) \
     X("sasl", SASLminc(-4), SASLSW) \
     X("nosasl", SASLminc(-6), NOSASLSW) \
     X("saslmaxssf", SASLminc(-10), SASLMXSSFSW) \
     X("saslmech", SASLminc(-5), SASLMECHSW) \
     X("user", SASLminc(-4), USERSW) \

-    X("port server port name/number", 4, PORTSW) \
+    X("port server submission port name/number", 4, PORTSW) \

     X("tls", TLSminc(-3), TLSSW) \
     X("initialtls", TLSminc(-10), INITTLSSW) \
     X("notls", TLSminc(-5), NTLSSW) \
     X("tls", TLSminc(-3), TLSSW) \
     X("initialtls", TLSminc(-10), INITTLSSW) \
     X("notls", TLSminc(-5), NTLSSW) \


@@ -201,7 +200,7 @@ static int sasl=0;          /* Use SASL auth for SMTP                */
 static int saslssf=-1;         /* Our maximum SSF for SASL              */
 static char *saslmech=NULL;    /* Force use of particular SASL mech     */
 static char *user=NULL;                /* Authenticate as this user             */
 static int saslssf=-1;         /* Our maximum SSF for SASL              */
 static char *saslmech=NULL;    /* Force use of particular SASL mech     */
 static char *user=NULL;                /* Authenticate as this user             */

-static char *port="smtp";      /* Name of server port for SMTP          */
+static char *port="submission";        /* Name of server port for SMTP submission */

 static int tls=0;              /* Use TLS for encryption                */
 static int fromcount=0;                /* Count of addresses on From: header    */
 static int seensender=0;       /* Have we seen a Sender: header?        */
 static int tls=0;              /* Use TLS for encryption                */
 static int fromcount=0;                /* Count of addresses on From: header    */
 static int seensender=0;       /* Have we seen a Sender: header?        */


@@ -238,12 +237,9 @@ static int snoop      = 0;
 static char *clientsw = NULL;
 static char *serversw = NULL;
 
 static char *clientsw = NULL;
 static char *serversw = NULL;
 

-extern struct smtp sm_reply;
-

 static char prefix[] = "----- =_aaaaaaaaaa";
 
 static char *partno = NULL;
 static char prefix[] = "----- =_aaaaaaaaaa";
 
 static char *partno = NULL;

-static int queued = 0;

 
 /*
  * static prototypes
 
 /*
  * static prototypes


@@ -424,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;


@@ -1528,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));
 


@@ -1568,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));