X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=mutt_sasl.h;h=e3c3961d16866e510374973755f10a2f3b99dcec;hp=763c8d9d5bba3809d7f84669bb5c261b6a4dce56;hb=cee5fbe35ef7c5b6d0593dc5c35b1c40b74eed38;hpb=ae0ce4dfcafa0c3820f107c5bfa8bd06e5272b57

diff --git a/mutt_sasl.h b/mutt_sasl.h
index 763c8d9..e3c3961 100644
--- a/mutt_sasl.h
+++ b/mutt_sasl.h
@@ -12,32 +12,34 @@
 #ifndef _MUTT_SASL_H_
 #define _MUTT_SASL_H_ 1
 
-#include <sasl/sasl.h>
+#include <lib-lib/lib-lib.h>
+#ifdef USE_SASL
 
-#include "mutt_socket.h"
+#include <sasl/sasl.h>
+#include <lib-sys/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);
+void mutt_sasl_done(void);
 
 typedef struct {
-  sasl_conn_t *saslconn;
-  const sasl_ssf_t *ssf;
-  const unsigned int *pbufsize;
-
-  /* read buffer */
-  char *buf;
-  unsigned int blen;
-  unsigned int bpos;
-
-  /* underlying socket data */
-  void *sockdata;
-  int (*msasl_open) (CONNECTION * conn);
-  int (*msasl_close) (CONNECTION * conn);
-  int (*msasl_read) (CONNECTION * conn, char *buf, size_t len);
-  int (*msasl_write) (CONNECTION * conn, const char *buf, size_t count);
+    sasl_conn_t *saslconn;
+    const sasl_ssf_t *ssf;
+    const unsigned int *pbufsize;
+
+    /* read buffer */
+    char *buf;
+    unsigned blen;
+    unsigned int bpos;
+
+    /* underlying socket data */
+    void *sockdata;
+    int (*msasl_open) (CONNECTION * conn);
+    int (*msasl_close) (CONNECTION * conn);
+    int (*msasl_read) (CONNECTION * conn, char *buf, ssize_t len);
+    int (*msasl_write) (CONNECTION * conn, const char *buf, ssize_t count);
 } SASL_DATA;
 
+#endif /* USE_SASL */
 #endif /* _MUTT_SASL_H_ */