lib-network

[apps/madmutt.git] / mutt_sasl.h

diff --git a/mutt_sasl.h b/mutt_sasl.h
index 5286af1..9c71a67 100644 (file)
--- a/mutt_sasl.h
+++ b/mutt_sasl.h
@@ -12,18 +12,15 @@
 #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"
+#include <lib-network/mutt_socket.h>
 
 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;
@@ -31,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;