X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/803f254122dc757db104a4c36cf98b726be004be..9986784343b5e29b4e3160932b4cd2dcfe21f71a:/uip/post.c

diff --git a/uip/post.c b/uip/post.c
index 0beab55b..db457ad2 100644
--- a/uip/post.c
+++ b/uip/post.c
@@ -76,11 +76,11 @@
     X("server host", 6, SERVSW) /* specify alternate SMTP server */ \
     X("snoop", -5, SNOOPSW) /* snoop the SMTP transaction */ \
     X("partno", -6, PARTSW) \
-    X("sasl", SASLminc(-4), SASLSW) \
-    X("nosasl", SASLminc(-6), NOSASLSW) \
-    X("saslmaxssf", SASLminc(-10), SASLMXSSFSW) \
-    X("saslmech", SASLminc(-5), SASLMECHSW) \
-    X("oauth", -5, OAUTHSW) \
+    X("sasl", SASLminc(4), SASLSW) \
+    X("nosasl", SASLminc(6), NOSASLSW) \
+    X("saslmaxssf", SASLminc(10), SASLMXSSFSW) \
+    X("saslmech", SASLminc(5), SASLMECHSW) \
+    X("authservice", SASLminc(0), AUTHSERVICESW) \
     X("user", SASLminc(-4), USERSW) \
     X("port server submission port name/number", 4, PORTSW) \
     X("tls", TLSminc(-3), TLSSW) \
@@ -88,6 +88,7 @@
     X("notls", TLSminc(-5), NTLSSW) \
     X("fileproc", -4, FILEPROCSW) \
     X("mhlproc", -3, MHLPROCSW) \
+    X("sendmail program", 0, MTSSM) \
     X("mts smtp|sendmail/smtp|sendmail/pipe", 2, MTSSW) \
     X("credentials legacy|file:filename", 0, CREDENTIALSSW) \
     X("messageid localname|random", 2, MESSAGEIDSW) \
@@ -441,10 +442,13 @@ main (int argc, char **argv)
 			adios (NULL, "missing argument to %s", argp[-2]);
 		    continue;
 
-		case OAUTHSW:
-		    if (!(cp = *argp++) || *cp == '-')
+		case AUTHSERVICESW:
+#ifdef OAUTH_SUPPORT
+		    if (!(xoauth_client_res = *argp++) || *xoauth_client_res == '-')
 			adios (NULL, "missing argument to %s", argp[-2]);
-                    xoauth_client_res = cp;
+#else
+		    adios (NULL, "not built with OAuth support");
+#endif
 		    continue;
 
 		case USERSW:
@@ -481,6 +485,12 @@ main (int argc, char **argv)
 		    mhlproc = cp;
 		    continue;
 
+		case MTSSM:
+		    if (!(cp = *argp++) || *cp == '-')
+			adios (NULL, "missing argument to %s", argp[-2]);
+                    sendmail = cp;
+		    continue;
+
 		case MTSSW:
 		    if (!(cp = *argp++) || *cp == '-')
 			adios (NULL, "missing argument to %s", argp[-2]);