Import madtty, use it to deal with colors from now on as it needs to know what is...

[apps/madmutt.git] / mutt_sasl.h

diff --git a/mutt_sasl.h b/mutt_sasl.h
index 4017a26..9f93688 100644 (file)
--- 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,39 +12,14 @@
 #ifndef _MUTT_SASL_H_
 #define _MUTT_SASL_H_ 1
 
-#ifdef USE_SASL2
-#include <sasl/sasl.h>
-#else
-#include <sasl.h>
-#endif
+#include <lib-lib/lib-lib.h>
 
-#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 *);
-
-typedef struct {
-  sasl_conn_t *saslconn;
-  const sasl_ssf_t *ssf;
-  const unsigned int *pbufsize;
-
-  /* read buffer */
-#ifdef USE_SASL2
-  const char *buf;
-#else
-  char *buf;
-#endif
-  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_DATA;
+void mutt_sasl_shutdown(void);
 
 #endif /* _MUTT_SASL_H_ */