X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=mutt_sasl.h;h=f0b27f62217187ca860604f6610bce62cb034d83;hp=eaba032f82ec12039f829613f0b68cbbd3e1f407;hb=6ebff74ad242d4c56fb7762965b19cee14fd2daa;hpb=6833ce8bdca2d64e14485118f2a4417b7e1cb1b1

diff --git a/mutt_sasl.h b/mutt_sasl.h
index eaba032..f0b27f6 100644
--- a/mutt_sasl.h
+++ b/mutt_sasl.h
@@ -1,61 +1,42 @@
 /*
- * Copyright (C) 2000-1 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.
- */ 
+ * Copyright notice from original mutt:
+ * Copyright (C) 2000-5 Brendan Cully <brendan@kublai.com>
+ *
+ * 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 */
 
 #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"
-
-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 (*open) (CONNECTION* conn);
-  int (*close) (CONNECTION* conn);
-  int (*read) (CONNECTION* conn, char* buf, size_t len);
-  int (*write) (CONNECTION* conn, const char* buf, size_t count);
-}
-SASL_DATA;
+
+#include <lib-sys/mutt_socket.h>
+
+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);
+
+typedef struct {
+    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 /* _MUTT_SASL_H_ */