[dovecot-cvs] dovecot/src/auth Makefile.am, 1.33, 1.34 mech-cyrus-sasl2.c, 1.4, NONE mech.c, 1.38, 1.39 mech.h, 1.21, 1.22

[cras at dovecot.org]

Update of /var/lib/cvs/dovecot/src/auth
In directory talvi:/tmp/cvs-serv7998/src/auth

Modified Files:
	Makefile.am mech.c mech.h 
Removed Files:
	mech-cyrus-sasl2.c 
Log Message:
Removed Cyrus SASL code completely. It hasn't worked for ages (if ever?) and
there's not much point in having it anyway.



Index: Makefile.am
===================================================================
RCS file: /var/lib/cvs/dovecot/src/auth/Makefile.am,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- Makefile.am	16 Sep 2004 15:12:12 -0000	1.33
+++ Makefile.am	10 Oct 2004 13:55:12 -0000	1.34
@@ -40,7 +40,6 @@
 	main.c \
 	mech.c \
 	mech-anonymous.c \
-	mech-cyrus-sasl2.c \
 	mech-plain.c \
 	mech-login.c \
 	mech-cram-md5.c \

--- mech-cyrus-sasl2.c DELETED ---

Index: mech.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/auth/mech.c,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -d -r1.38 -r1.39
--- mech.c	8 Oct 2004 17:51:47 -0000	1.38
+++ mech.c	10 Oct 2004 13:55:12 -0000	1.39
@@ -20,7 +20,6 @@
 char username_chars[256], username_translation[256];
 int ssl_require_client_cert;
 
-static int set_use_cyrus_sasl;
 static struct auth_client_request_reply failure_reply;
 
 static buffer_t *auth_failures_buf;
@@ -114,13 +113,7 @@
 		return;
 	}
 
-#ifdef USE_CYRUS_SASL2
-	if (set_use_cyrus_sasl)
-		auth_request = mech_cyrus_sasl_new(conn, request, callback);
-	else
-#endif
-		auth_request = mech->auth_new();
-
+	auth_request = mech->auth_new();
 	if (auth_request == NULL)
 		return;
 
@@ -473,11 +466,6 @@
 		}
 	}
 
-	set_use_cyrus_sasl = getenv("USE_CYRUS_SASL") != NULL;
-#ifdef USE_CYRUS_SASL2
-	if (set_use_cyrus_sasl)
-		mech_cyrus_sasl_init_lib();
-#endif
 	ssl_require_client_cert = getenv("SSL_REQUIRE_CLIENT_CERT") != NULL;
 
 	auth_failures_buf = buffer_create_dynamic(default_pool, 1024);

Index: mech.h
===================================================================
RCS file: /var/lib/cvs/dovecot/src/auth/mech.h,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- mech.h	31 Aug 2004 09:31:19 -0000	1.21
+++ mech.h	10 Oct 2004 13:55:12 -0000	1.22
@@ -83,13 +83,6 @@
 
 int mech_fix_username(char *username, const char **error_r);
 
-void mech_cyrus_sasl_init_lib(void);
-struct auth_request *
-mech_cyrus_sasl_new(struct auth_client_connection *conn,
-		    struct auth_client_request_new *request,
-		    const unsigned char *data,
-		    mech_callback_t *callback);
-
 void auth_request_ref(struct auth_request *request);
 int auth_request_unref(struct auth_request *request);