upstream/603288-split-fetches.patch: split FETCH's into smaller chunks, workaround...

[software/mutt-debian.git] / mutt_sasl.c

diff --git a/mutt_sasl.c b/mutt_sasl.c
index 2bc3020e3f837e205da669fa530bfdc998271290..e85970dbb3cd6fad7e5fe8fc1d1e629d58a9633c 100644 (file)
--- a/mutt_sasl.c
+++ b/mutt_sasl.c
@@ -304,7 +304,7 @@ int mutt_sasl_interact (sasl_interact_t* interaction)
 
     snprintf (prompt, sizeof (prompt), "%s: ", interaction->prompt);
     resp[0] = '\0';
 
     snprintf (prompt, sizeof (prompt), "%s: ", interaction->prompt);
     resp[0] = '\0';

-    if (mutt_get_field (prompt, resp, sizeof (resp), 0))
+    if (option (OPTNOCURSES) || mutt_get_field (prompt, resp, sizeof (resp), 0))

       return SASL_FAIL;
 
     interaction->len = mutt_strlen (resp)+1;
       return SASL_FAIL;
 
     interaction->len = mutt_strlen (resp)+1;


@@ -481,6 +481,7 @@ static int mutt_sasl_conn_close (CONNECTION* conn)
   conn->conn_close = sasldata->msasl_close;
   conn->conn_read = sasldata->msasl_read;
   conn->conn_write = sasldata->msasl_write;
   conn->conn_close = sasldata->msasl_close;
   conn->conn_read = sasldata->msasl_read;
   conn->conn_write = sasldata->msasl_write;

+  conn->conn_poll = sasldata->msasl_poll;

 
   /* release sasl resources */
   sasl_dispose (&sasldata->saslconn);
 
   /* release sasl resources */
   sasl_dispose (&sasldata->saslconn);