Mercurial > dovecot > original-hg > dovecot-1.2

changeset 3072:289a98ba5d95 HEAD

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Another try with API cleanup.
author Timo Sirainen <tss@iki.fi>
date Sat, 08 Jan 2005 23:37:32 +0200
parents c7db6b291daa
children 7e0caae73c59
files src/auth/auth-client-connection.c src/auth/auth-request.c src/auth/auth-request.h src/auth/mech-anonymous.c src/auth/mech-apop.c src/auth/mech-cram-md5.c src/auth/mech-digest-md5.c src/auth/mech-login.c src/auth/mech-ntlm.c src/auth/mech-plain.c src/auth/mech-rpa.c src/auth/mech.h
diffstat 12 files changed, 29 insertions(+), 36 deletions(-) [+]
line wrap: on
line diff
--- a/src/auth/auth-client-connection.c	Sat Jan 08 23:22:52 2005 +0200
+++ b/src/auth/auth-client-connection.c	Sat Jan 08 23:37:32 2005 +0200
@@ -226,14 +226,7 @@
 		return FALSE;
 	}
 
-	request = mech->auth_new(auth_callback);
-	if (request == NULL)
-		return TRUE;
-
-	request->auth = conn->auth;
-	request->mech = mech;
-	request->created = ioloop_time;
-
+	request = auth_request_new(conn->auth, mech, auth_callback);
 	hash_insert(conn->auth_requests, POINTER_CAST(id), request);
 
 	request->conn = conn;
--- a/src/auth/auth-request.c	Sat Jan 08 23:22:52 2005 +0200
+++ b/src/auth/auth-request.c	Sat Jan 08 23:37:32 2005 +0200
@@ -23,6 +23,22 @@
 static buffer_t *auth_failures_buf;
 static struct timeout *to_auth_failures;
 
+struct auth_request *
+auth_request_new(struct auth *auth, struct mech_module *mech,
+		 mech_callback_t *callback)
+{
+	struct auth_request *request;
+
+	request = mech->auth_new();
+
+	request->refcount = 1;
+	request->auth = auth;
+	request->mech = mech;
+	request->callback = callback;
+	request->created = ioloop_time;
+	return request;
+}
+
 void auth_request_destroy(struct auth_request *request)
 {
 	i_assert(request->refcount > 0);
--- a/src/auth/auth-request.h	Sat Jan 08 23:22:52 2005 +0200
+++ b/src/auth/auth-request.h	Sat Jan 08 23:37:32 2005 +0200
@@ -41,8 +41,9 @@
 void auth_request_fail(struct auth_request *request);
 void auth_request_internal_failure(struct auth_request *request);
 
-struct auth_request *auth_request_new(struct auth *auth,
-				      struct mech_module *mech);
+struct auth_request *
+auth_request_new(struct auth *auth, struct mech_module *mech,
+		 mech_callback_t *callback);
 void auth_request_destroy(struct auth_request *request);
 void auth_request_ref(struct auth_request *request);
 int auth_request_unref(struct auth_request *request);
--- a/src/auth/mech-anonymous.c	Sat Jan 08 23:22:52 2005 +0200
+++ b/src/auth/mech-anonymous.c	Sat Jan 08 23:37:32 2005 +0200
@@ -41,16 +41,14 @@
 	pool_unref(request->pool);
 }
 
-static struct auth_request *mech_anonymous_auth_new(mech_callback_t *callback)
+static struct auth_request *mech_anonymous_auth_new(void)
 {
         struct auth_request *request;
 	pool_t pool;
 
 	pool = pool_alloconly_create("anonymous_auth_request", 256);
 	request = p_new(pool, struct auth_request, 1);
-	request->refcount = 1;
 	request->pool = pool;
-	request->callback = callback;
 	return request;
 }
 
--- a/src/auth/mech-apop.c	Sat Jan 08 23:22:52 2005 +0200
+++ b/src/auth/mech-apop.c	Sat Jan 08 23:37:32 2005 +0200
@@ -138,7 +138,7 @@
 	pool_unref(request->pool);
 }
 
-static struct auth_request *mech_apop_auth_new(mech_callback_t *callback)
+static struct auth_request *mech_apop_auth_new(void)
 {
 	struct apop_auth_request *request;
 	pool_t pool;
@@ -147,9 +147,7 @@
 	request = p_new(pool, struct apop_auth_request, 1);
 	request->pool = pool;
 
-	request->auth_request.refcount = 1;
 	request->auth_request.pool = pool;
-	request->auth_request.callback = callback;
 	return &request->auth_request;
 }
 
--- a/src/auth/mech-cram-md5.c	Sat Jan 08 23:22:52 2005 +0200
+++ b/src/auth/mech-cram-md5.c	Sat Jan 08 23:37:32 2005 +0200
@@ -173,7 +173,7 @@
 	pool_unref(request->pool);
 }
 
-static struct auth_request *mech_cram_md5_auth_new(mech_callback_t *callback)
+static struct auth_request *mech_cram_md5_auth_new(void)
 {
 	struct cram_auth_request *request;
 	pool_t pool;
@@ -182,9 +182,7 @@
 	request = p_new(pool, struct cram_auth_request, 1);
 	request->pool = pool;
 
-	request->auth_request.refcount = 1;
 	request->auth_request.pool = pool;
-	request->auth_request.callback = callback;
 	return &request->auth_request;
 }
 
--- a/src/auth/mech-digest-md5.c	Sat Jan 08 23:22:52 2005 +0200
+++ b/src/auth/mech-digest-md5.c	Sat Jan 08 23:37:32 2005 +0200
@@ -599,8 +599,7 @@
 	pool_unref(request->pool);
 }
 
-static struct auth_request *
-mech_digest_md5_auth_new(mech_callback_t *callback)
+static struct auth_request *mech_digest_md5_auth_new(void)
 {
 	struct digest_auth_request *request;
 	pool_t pool;
@@ -610,9 +609,7 @@
 	request->pool = pool;
 	request->qop = QOP_AUTH;
 
-	request->auth_request.refcount = 1;
 	request->auth_request.pool = pool;
-	request->auth_request.callback = callback;
 	return &request->auth_request;
 }
 
--- a/src/auth/mech-login.c	Sat Jan 08 23:22:52 2005 +0200
+++ b/src/auth/mech-login.c	Sat Jan 08 23:37:32 2005 +0200
@@ -71,16 +71,14 @@
 	pool_unref(request->pool);
 }
 
-static struct auth_request *mech_login_auth_new(mech_callback_t *callback)
+static struct auth_request *mech_login_auth_new(void)
 {
 	struct auth_request *request;
 	pool_t pool;
 
 	pool = pool_alloconly_create("login_auth_request", 256);
 	request = p_new(pool, struct auth_request, 1);
-	request->refcount = 1;
 	request->pool = pool;
-	request->callback = callback;
 	return request;
 }
 
--- a/src/auth/mech-ntlm.c	Sat Jan 08 23:22:52 2005 +0200
+++ b/src/auth/mech-ntlm.c	Sat Jan 08 23:37:32 2005 +0200
@@ -260,7 +260,7 @@
 	pool_unref(request->pool);
 }
 
-static struct auth_request *mech_ntlm_auth_new(mech_callback_t *callback)
+static struct auth_request *mech_ntlm_auth_new(void)
 {
 	struct ntlm_auth_request *request;
 	pool_t pool;
@@ -269,9 +269,7 @@
 	request = p_new(pool, struct ntlm_auth_request, 1);
 	request->pool = pool;
 
-	request->auth_request.refcount = 1;
 	request->auth_request.pool = pool;
-	request->auth_request.callback = callback;
 	return &request->auth_request;
 }
 
--- a/src/auth/mech-plain.c	Sat Jan 08 23:22:52 2005 +0200
+++ b/src/auth/mech-plain.c	Sat Jan 08 23:37:32 2005 +0200
@@ -86,16 +86,14 @@
 	pool_unref(request->pool);
 }
 
-static struct auth_request *mech_plain_auth_new(mech_callback_t *callback)
+static struct auth_request *mech_plain_auth_new(void)
 {
         struct auth_request *request;
 	pool_t pool;
 
 	pool = pool_alloconly_create("plain_auth_request", 256);
 	request = p_new(pool, struct auth_request, 1);
-	request->refcount = 1;
 	request->pool = pool;
-        request->callback = callback;
 	return request;
 }
 
--- a/src/auth/mech-rpa.c	Sat Jan 08 23:22:52 2005 +0200
+++ b/src/auth/mech-rpa.c	Sat Jan 08 23:37:32 2005 +0200
@@ -549,7 +549,7 @@
 	pool_unref(auth_request->pool);
 }
 
-static struct auth_request *mech_rpa_auth_new(mech_callback_t *callback)
+static struct auth_request *mech_rpa_auth_new(void)
 {
 	struct rpa_auth_request *request;
 	pool_t pool;
@@ -559,9 +559,7 @@
 	request->pool = pool;
 	request->phase = 0;
 
-	request->auth_request.refcount = 1;
 	request->auth_request.pool = pool;
-	request->auth_request.callback = callback;
 	return &request->auth_request;
 }
 
--- a/src/auth/mech.h	Sat Jan 08 23:22:52 2005 +0200
+++ b/src/auth/mech.h	Sat Jan 08 23:37:32 2005 +0200
@@ -24,7 +24,7 @@
 	unsigned int passdb_need_plain:1;
 	unsigned int passdb_need_credentials:1;
 
-	struct auth_request *(*auth_new)(mech_callback_t *callback);
+	struct auth_request *(*auth_new)(void);
 	void (*auth_initial)(struct auth_request *request,
 			     const unsigned char *data, size_t data_size);
 	void (*auth_continue)(struct auth_request *request,