X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=imap%2Fauth_sasl.c;h=e83544fe228d49e135a8426520c1086f7cc71d10;hp=49c09a342b7864e74b5c1105725309178d481f22;hb=0f44dc85fc1280372ffab911d701e703d803fb4b;hpb=df70e07e24add1869bcc9b7af2277d9d0c09a281

diff --git a/imap/auth_sasl.c b/imap/auth_sasl.c
index 49c09a3..e83544f 100644
--- a/imap/auth_sasl.c
+++ b/imap/auth_sasl.c
@@ -1,19 +1,10 @@
 /*
+ * Copyright notice from original mutt:
  * Copyright (C) 2000-3 Brendan Cully <brendan@kublai.com>
- * 
- *     This program is free software; you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation; either version 2 of the License, or
- *     (at your option) any later version.
- * 
- *     This program is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- * 
- *     You should have received a copy of the GNU General Public License
- *     along with this program; if not, write to the Free Software
- *     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ *
+ * This file is part of mutt-ng, see http://www.muttng.org/.
+ * It's licensed under the GNU General Public License,
+ * please see the file GPL in the top level source directory.
  */
 
 /* SASL login/authentication code */
@@ -27,6 +18,9 @@
 #include "imap_private.h"
 #include "auth.h"
 
+#include "lib/mem.h"
+#include "lib/intl.h"
+
 #ifdef USE_SASL2
 #include <sasl/sasl.h>
 #include <sasl/saslutil.h>
@@ -137,10 +131,10 @@ imap_auth_res_t imap_auth_sasl (IMAP_DATA * idata, const char *method)
     if (irc == IMAP_CMD_RESPOND) {
 #ifdef USE_SASL2
       if (sasl_decode64
-          (idata->cmd.buf + 2, strlen (idata->cmd.buf + 2), buf,
+          (idata->cmd.buf + 2, safe_strlen (idata->cmd.buf + 2), buf,
            LONG_STRING - 1,
 #else
-      if (sasl_decode64 (idata->cmd.buf + 2, strlen (idata->cmd.buf + 2), buf,
+      if (sasl_decode64 (idata->cmd.buf + 2, safe_strlen (idata->cmd.buf + 2), buf,
 #endif
                          &len) != SASL_OK) {
         dprint (1,