projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
move rfc822.c as well
[apps/madmutt.git]
/
imap
/
auth_sasl.c
diff --git
a/imap/auth_sasl.c
b/imap/auth_sasl.c
index
71b8f49
..
4d9df26
100644
(file)
--- a/
imap/auth_sasl.c
+++ b/
imap/auth_sasl.c
@@
-13,14
+13,15
@@
# include "config.h"
#endif
# include "config.h"
#endif
+#include <lib-lib/mem.h>
+#include <lib-lib/ascii.h>
+
#include "mutt.h"
#include "mutt.h"
-#include "ascii.h"
#include "mutt_sasl.h"
#include "imap_private.h"
#include "auth.h"
#include "mutt_sasl.h"
#include "imap_private.h"
#include "auth.h"
-#include "lib/mem.h"
-#include "lib/intl.h"
+#include <lib-lib/macros.h>
#include "lib/debug.h"
#include <sasl/sasl.h>
#include "lib/debug.h"
#include <sasl/sasl.h>
@@
-109,7
+110,7
@@
imap_auth_res_t imap_auth_sasl (IMAP_DATA * idata, const char *method)
if (irc == IMAP_CMD_RESPOND) {
if (sasl_decode64
if (irc == IMAP_CMD_RESPOND) {
if (sasl_decode64
- (idata->cmd.buf + 2,
str_len
(idata->cmd.buf + 2), buf,
+ (idata->cmd.buf + 2,
m_strlen
(idata->cmd.buf + 2), buf,
LONG_STRING - 1,
&len) != SASL_OK) {
debug_print (1, ("error base64-decoding server response.\n"));
LONG_STRING - 1,
&len) != SASL_OK) {
debug_print (1, ("error base64-decoding server response.\n"));
@@
-137,14
+138,10
@@
imap_auth_res_t imap_auth_sasl (IMAP_DATA * idata, const char *method)
debug_print (1, ("error base64-encoding client response.\n"));
goto bail;
}
debug_print (1, ("error base64-encoding client response.\n"));
goto bail;
}
-
- /* sasl_client_st(art|ep) allocate pc with malloc, expect me to
- * free it */
- mem_free (&pc);
}
if (irc == IMAP_CMD_RESPOND) {
}
if (irc == IMAP_CMD_RESPOND) {
-
strfcpy (buf + olen, "\r\n", sizeof (buf) - olen
);
+
m_strcpy(buf + olen, sizeof(buf) - olen, "\r\n"
);
mutt_socket_write (idata->conn, buf);
}
mutt_socket_write (idata->conn, buf);
}