Build system simplifications.

[apps/madmutt.git] / mutt_sasl.c

diff --git a/mutt_sasl.c b/mutt_sasl.c
index f38acda..219c36d 100644 (file)
--- a/mutt_sasl.c
+++ b/mutt_sasl.c
@@ -11,6 +11,8 @@
 
 #include <lib-lib/lib-lib.h>
 
+#ifdef USE_SASL
+
 #include <netdb.h>
 #include <sasl/sasl.h>
 #include <sys/socket.h>
@@ -186,8 +188,8 @@ int mutt_sasl_client_new (CONNECTION * conn, sasl_conn_t ** saslconn)
 
 int mutt_sasl_interact (sasl_interact_t * interaction)
 {
-    char prompt[SHORT_STRING];
-    char resp[SHORT_STRING];
+    char prompt[STRING];
+    char resp[STRING];
 
     while (interaction->id != SASL_CB_LIST_END) {
         snprintf (prompt, sizeof (prompt), "%s: ", interaction->prompt);
@@ -302,7 +304,7 @@ static int mutt_sasl_cb_pass(sasl_conn_t *conn __attribute__ ((unused)),
 
     *psecret = xmalloc(sizeof(sasl_secret_t) + len);
     (*psecret)->len = len;
-    m_strcpy((char*)(*psecret)->data, len, account->pass);
+    memcpy((char*)(*psecret)->data, account->pass, len);
 
     return SASL_OK;
 }
@@ -434,9 +436,9 @@ mutt_sasl_conn_write(CONNECTION * conn, const char *buf, ssize_t len)
                 goto fail;
             }
 
-            rc = (sasldata->msasl_write)(conn, pbuf, plen);
+            plen -= (sasldata->msasl_write)(conn, pbuf, plen);
             p_delete(&pbuf);
-            if (rc != plen)
+            if (plen)
                 goto fail;
 
             len -= olen;
@@ -455,3 +457,5 @@ fail:
     conn->sockdata = sasldata;
     return -1;
 }
+
+#endif /* USE_SASL */