X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=mutt_sasl.h;h=ca69bb8edbe8b7449997de9981ff7b0bb5905374;hp=4017a26a125a1e88ebf57be2189a903f374843bf;hb=9afa66139f6099fc06d9866d4283191e43b0e17a;hpb=df70e07e24add1869bcc9b7af2277d9d0c09a281

diff --git a/mutt_sasl.h b/mutt_sasl.h
index 4017a26..ca69bb8 100644
--- a/mutt_sasl.h
+++ b/mutt_sasl.h
@@ -1,19 +1,10 @@
 /*
+ * Copyright notice from original mutt:
  * Copyright (C) 2000-5 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.
  */
 
 /* common SASL helper routines */
@@ -21,11 +12,7 @@
 #ifndef _MUTT_SASL_H_
 #define _MUTT_SASL_H_ 1
 
-#ifdef USE_SASL2
 #include <sasl/sasl.h>
-#else
-#include <sasl.h>
-#endif
 
 #include "mutt_socket.h"
 
@@ -33,6 +20,7 @@ int mutt_sasl_client_new (CONNECTION *, sasl_conn_t **);
 sasl_callback_t *mutt_sasl_get_callbacks (ACCOUNT *);
 int mutt_sasl_interact (sasl_interact_t *);
 void mutt_sasl_setup_conn (CONNECTION *, sasl_conn_t *);
+void mutt_sasl_done (void);
 
 typedef struct {
   sasl_conn_t *saslconn;
@@ -40,11 +28,7 @@ typedef struct {
   const unsigned int *pbufsize;
 
   /* read buffer */
-#ifdef USE_SASL2
   const char *buf;
-#else
-  char *buf;
-#endif
   unsigned int blen;
   unsigned int bpos;