X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/2e04b8ea0e57e411665aa6a8814ff65db0d4cd2b..380046d2c839b074a239cc4c8b866e647ec82eea:/uip/send.c?ds=sidebyside

diff --git a/uip/send.c b/uip/send.c
index 03a54698..5dcdce0e 100644
--- a/uip/send.c
+++ b/uip/send.c
@@ -268,11 +268,6 @@ main (int argc, char **argv)
                     user = cp;
 		    continue;
 
-		case SASLMECHSW:
-		    if (!(saslmech = *argp++) || *saslmech == '-')
-			adios (NULL, "missing argument to %s", argp[-2]);
-		    continue;
-
 		case AUTHSERVICESW:
 #ifdef OAUTH_SUPPORT
 		    if (!(auth_svc = *argp++) || *auth_svc == '-')
@@ -282,6 +277,11 @@ main (int argc, char **argv)
 #endif
 		    continue;
 
+		case SASLMECHSW:
+		    if (!(saslmech = *argp) || *saslmech == '-')
+			adios (NULL, "missing argument to %s", argp[-2]);
+		    /* Fall through */
+
 		case ALIASW: 
 		case FILTSW: 
 		case WIDTHSW: 
@@ -459,13 +459,6 @@ go_to_it:
         if (user == NULL) {
             adios (NULL, "must specify -user with -saslmech xoauth2");
         }
-
-        vec[vecp++] = "-authservice";
-        if (saslmech  &&  ! strcasecmp(saslmech, "xoauth2")) {
-            vec[vecp++] = mh_oauth_do_xoauth (user, auth_svc, snoop ? stderr : NULL);
-        } else {
-            vec[vecp++] = auth_svc;
-        }
     }
 #else
     NMH_UNUSED(auth_svc);
@@ -485,7 +478,7 @@ go_to_it:
     closefds (3);
 
     for (msgnum = 0; msgnum < msgp; msgnum++) {
-	switch (sendsbr (vec, vecp, program, msgs[msgnum], &st, 1)) {
+	switch (sendsbr (vec, vecp, program, msgs[msgnum], &st, 1, auth_svc)) {
 	    case DONE: 
 		done (++status);
 	    case NOTOK: