rework some things with sasl.

fix warning.

Signed-off-by: Pierre Habouzit <madcoder@debian.org>

diff --git a/lib-ui/curs_main.c b/lib-ui/curs_main.c
index 31c11bf..45c5105 100644 (file)
--- a/lib-ui/curs_main.c
+++ b/lib-ui/curs_main.c
@@ -27,7 +27,6 @@
 #include "recvattach.h"
 #include "buffy.h"
 #include "thread.h"
-#include "mutt_sasl.h"
 
 #include <imap/imap_private.h>
 
@@ -2315,7 +2314,6 @@ int mutt_index_menu (void)
   /* Close all open NNTP connections */
     nntp_logout_all ();
 #endif
-    mutt_sasl_done ();
   }
 
   mutt_menuDestroy (&menu);

diff --git a/main.c b/main.c
index d21f9ee..f953750 100644 (file)
--- a/main.c
+++ b/main.c
@@ -804,5 +804,6 @@ int main (int argc, char **argv)
   }
 
   luaM_shutdown();
+  mutt_sasl_shutdown();
   exit (0);
 }

diff --git a/mutt_sasl.c b/mutt_sasl.c
index 13262b8..6d1918f 100644 (file)
--- a/mutt_sasl.c
+++ b/mutt_sasl.c
@@ -268,8 +268,8 @@ void mutt_sasl_setup_conn (CONNECTION * conn, sasl_conn_t * saslconn)
     conn->conn_write = mutt_sasl_conn_write;
 }
 
-void mutt_sasl_done (void) {
-    sasl_done ();
+void mutt_sasl_shutdown(void) {
+    sasl_done();
 }
 
 /* mutt_sasl_cb_authname: callback to retrieve authname or user from ACCOUNT */

diff --git a/mutt_sasl.h b/mutt_sasl.h
index 4b038a9..9f93688 100644 (file)
--- a/mutt_sasl.h
+++ b/mutt_sasl.h
@@ -20,6 +20,6 @@
 int mutt_sasl_client_new (CONNECTION *, sasl_conn_t **);
 int mutt_sasl_interact (sasl_interact_t *);
 void mutt_sasl_setup_conn (CONNECTION *, sasl_conn_t *);
-void mutt_sasl_done(void);
+void mutt_sasl_shutdown(void);
 
 #endif /* _MUTT_SASL_H_ */

diff --git a/pop/pop_auth.c b/pop/pop_auth.c
index d86ea30..976317c 100644 (file)
--- a/pop/pop_auth.c
+++ b/pop/pop_auth.c
@@ -101,7 +101,7 @@ static pop_auth_res_t pop_auth_sasl (POP_DATA * pop_data, const char *method)
 
       /* sasl_client_st(art|ep) allocate pc with malloc, expect me to 
        * free it */
-      p_delete(&pc);
+      p_delete((char **)&pc);
     }
   }