Mercurial > dovecot > core-2.2
changeset 10894:5642902ae47b HEAD
auth: Auth request handler no longer keeps struct auth pointer.
author | Timo Sirainen <tss@iki.fi> |
---|---|
date | Sat, 13 Mar 2010 17:35:21 +0200 |
parents | 1a4c2e4bff75 |
children | 56fc8bbe114c |
files | src/auth/auth-client-connection.c src/auth/auth-request-handler.c src/auth/auth-request-handler.h |
diffstat | 3 files changed, 15 insertions(+), 16 deletions(-) [+] |
line wrap: on
line diff
--- a/src/auth/auth-client-connection.c Sat Mar 13 17:28:18 2010 +0200 +++ b/src/auth/auth-client-connection.c Sat Mar 13 17:35:21 2010 +0200 @@ -114,8 +114,8 @@ /* handshake complete, we can now actually start serving requests */ conn->refcount++; conn->request_handler = - auth_request_handler_create(conn->auth, - auth_callback, conn, auth_master_request_callback); + auth_request_handler_create(auth_callback, conn, + auth_master_request_callback); auth_request_handler_set(conn->request_handler, conn->connect_uid, pid); conn->pid = pid; @@ -173,7 +173,8 @@ conn->auth->set->debug_passwords ? line : auth_line_hide_pass(line)); } - return auth_request_handler_auth_begin(conn->request_handler, + return auth_request_handler_auth_begin(conn->auth, + conn->request_handler, line + 5); } if (strncmp(line, "CONT\t", 5) == 0) {
--- a/src/auth/auth-request-handler.c Sat Mar 13 17:28:18 2010 +0200 +++ b/src/auth/auth-request-handler.c Sat Mar 13 17:35:21 2010 +0200 @@ -22,7 +22,6 @@ pool_t pool; struct hash_table *requests; - struct auth *auth; unsigned int connect_uid, client_pid; auth_request_callback_t *callback; @@ -39,8 +38,7 @@ #undef auth_request_handler_create struct auth_request_handler * -auth_request_handler_create(struct auth *auth, - auth_request_callback_t *callback, void *context, +auth_request_handler_create(auth_request_callback_t *callback, void *context, auth_request_callback_t *master_callback) { struct auth_request_handler *handler; @@ -52,7 +50,6 @@ handler->refcount = 1; handler->pool = pool; handler->requests = hash_table_create(default_pool, pool, 0, NULL, NULL); - handler->auth = auth; handler->callback = callback; handler->context = context; handler->master_callback = master_callback; @@ -305,7 +302,8 @@ } } -bool auth_request_handler_auth_begin(struct auth_request_handler *handler, +bool auth_request_handler_auth_begin(struct auth *auth, + struct auth_request_handler *handler, const char *args) { const struct mech_module *mech; @@ -334,7 +332,7 @@ return FALSE; } - request = auth_request_new(handler->auth, mech, auth_callback, handler); + request = auth_request_new(auth, mech, auth_callback, handler); request->handler = handler; request->connect_uid = handler->connect_uid; request->client_pid = handler->client_pid;
--- a/src/auth/auth-request-handler.h Sat Mar 13 17:28:18 2010 +0200 +++ b/src/auth/auth-request-handler.h Sat Mar 13 17:35:21 2010 +0200 @@ -9,18 +9,17 @@ auth_request_callback_t(struct auth_stream_reply *reply, void *context); struct auth_request_handler * -auth_request_handler_create(struct auth *auth, - auth_request_callback_t *callback, void *context, +auth_request_handler_create(auth_request_callback_t *callback, void *context, auth_request_callback_t *master_callback); #ifdef CONTEXT_TYPE_SAFETY -# define auth_request_handler_create(auth, callback, context, master_callback)\ +# define auth_request_handler_create(callback, context, master_callback)\ ({(void)(1 ? 0 : callback((struct auth_stream_reply *)NULL, context)); \ - auth_request_handler_create(auth, \ + auth_request_handler_create( \ (auth_request_callback_t *)callback, context, \ master_callback); }) #else -# define auth_request_handler_create(auth, callback, context, master_callback)\ - auth_request_handler_create(auth, \ +# define auth_request_handler_create(callback, context, master_callback)\ + auth_request_handler_create( \ (auth_request_callback_t *)callback, context, \ master_callback) #endif @@ -30,7 +29,8 @@ unsigned int connect_uid, unsigned int client_pid); -bool auth_request_handler_auth_begin(struct auth_request_handler *handler, +bool auth_request_handler_auth_begin(struct auth *auth, + struct auth_request_handler *handler, const char *args); bool auth_request_handler_auth_continue(struct auth_request_handler *handler, const char *args);