Mercurial > dovecot > original-hg > dovecot-1.2
changeset 3068:b01a8fa09f94 HEAD
Cleanups.
author | Timo Sirainen <tss@iki.fi> |
---|---|
date | Sat, 08 Jan 2005 17:59:49 +0200 |
parents | 4c92f9eae613 |
children | 131151e25e4b |
files | src/auth/auth-client-connection.c src/auth/auth-master-connection.c src/auth/auth-request.c src/auth/auth-request.h 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/passdb.h src/auth/userdb.h |
diffstat | 13 files changed, 82 insertions(+), 32 deletions(-) [+] |
line wrap: on
line diff
--- a/src/auth/auth-client-connection.c Fri Jan 07 23:45:40 2005 +0200 +++ b/src/auth/auth-client-connection.c Sat Jan 08 17:59:49 2005 +0200 @@ -313,8 +313,8 @@ /* connection is referenced only until auth_callback is called. */ conn->refcount++; - mech->auth_initial(request, initial_resp_data, initial_resp_len, - auth_callback); + auth_request_initial(request, initial_resp_data, initial_resp_len, + auth_callback); return TRUE; } @@ -367,8 +367,7 @@ } conn->refcount++; - request->mech->auth_continue(request, buf->data, buf->used, - auth_callback); + auth_request_continue(request, buf->data, buf->used, auth_callback); return TRUE; }
--- a/src/auth/auth-master-connection.c Fri Jan 07 23:45:40 2005 +0200 +++ b/src/auth/auth-master-connection.c Sat Jan 08 17:59:49 2005 +0200 @@ -149,8 +149,8 @@ master_request->auth_request = request; conn->refcount++; - request->auth->userdb->lookup(request, userdb_callback, - master_request); + auth_request_lookup_user(request, userdb_callback, + master_request); } return TRUE; }
--- a/src/auth/auth-request.c Fri Jan 07 23:45:40 2005 +0200 +++ b/src/auth/auth-request.c Sat Jan 08 17:59:49 2005 +0200 @@ -117,6 +117,41 @@ return FALSE; } +void auth_request_initial(struct auth_request *request, + const unsigned char *data, size_t data_size, + mech_callback_t *callback) +{ + request->mech->auth_initial(request, data, data_size, callback); +} + +void auth_request_continue(struct auth_request *request, + const unsigned char *data, size_t data_size, + mech_callback_t *callback) +{ + request->mech->auth_continue(request, data, data_size, callback); +} + +void auth_request_verify_plain(struct auth_request *request, + const char *password, + verify_plain_callback_t *callback) +{ + request->auth->passdb->verify_plain(request, password, callback); +} + +void auth_request_lookup_credentials(struct auth_request *request, + enum passdb_credentials credentials, + lookup_credentials_callback_t *callback) +{ + request->auth->passdb->lookup_credentials(request, credentials, + callback); +} + +void auth_request_lookup_user(struct auth_request *request, + userdb_callback_t *callback, void *context) +{ + request->auth->userdb->lookup(request, callback, context); +} + int auth_request_set_username(struct auth_request *request, const char *username, const char **error_r) {
--- a/src/auth/auth-request.h Fri Jan 07 23:45:40 2005 +0200 +++ b/src/auth/auth-request.h Sat Jan 08 17:59:49 2005 +0200 @@ -3,6 +3,8 @@ #include "network.h" #include "mech.h" +#include "userdb.h" +#include "passdb.h" struct auth_client_connection; @@ -45,6 +47,22 @@ void auth_request_ref(struct auth_request *request); int auth_request_unref(struct auth_request *request); +void auth_request_initial(struct auth_request *request, + const unsigned char *data, size_t data_size, + mech_callback_t *callback); +void auth_request_continue(struct auth_request *request, + const unsigned char *data, size_t data_size, + mech_callback_t *callback); + +void auth_request_verify_plain(struct auth_request *request, + const char *password, + verify_plain_callback_t *callback); +void auth_request_lookup_credentials(struct auth_request *request, + enum passdb_credentials credentials, + lookup_credentials_callback_t *callback); +void auth_request_lookup_user(struct auth_request *request, + userdb_callback_t *callback, void *context); + int auth_request_set_username(struct auth_request *request, const char *username, const char **error_r);
--- a/src/auth/mech-apop.c Fri Jan 07 23:45:40 2005 +0200 +++ b/src/auth/mech-apop.c Sat Jan 08 17:59:49 2005 +0200 @@ -141,9 +141,9 @@ memcpy(request->digest, tmp, sizeof(request->digest)); - auth_request->auth->passdb-> - lookup_credentials(auth_request, PASSDB_CREDENTIALS_PLAINTEXT, - apop_credentials_callback); + auth_request_lookup_credentials(auth_request, + PASSDB_CREDENTIALS_PLAINTEXT, + apop_credentials_callback); } static void mech_apop_auth_free(struct auth_request *request)
--- a/src/auth/mech-cram-md5.c Fri Jan 07 23:45:40 2005 +0200 +++ b/src/auth/mech-cram-md5.c Sat Jan 08 17:59:49 2005 +0200 @@ -146,10 +146,9 @@ if (auth_request_set_username(auth_request, request->username, &error)) { - auth_request->auth->passdb-> - lookup_credentials(auth_request, - PASSDB_CREDENTIALS_CRAM_MD5, - credentials_callback); + auth_request_lookup_credentials(auth_request, + PASSDB_CREDENTIALS_CRAM_MD5, + credentials_callback); return; } }
--- a/src/auth/mech-digest-md5.c Fri Jan 07 23:45:40 2005 +0200 +++ b/src/auth/mech-digest-md5.c Sat Jan 08 17:59:49 2005 +0200 @@ -569,8 +569,7 @@ request->realm, NULL); if (auth_request_set_username(auth_request, username, &error)) { - auth_request->auth->passdb-> - lookup_credentials(auth_request, + auth_request_lookup_credentials(auth_request, PASSDB_CREDENTIALS_DIGEST_MD5, credentials_callback); return;
--- a/src/auth/mech-login.c Fri Jan 07 23:45:40 2005 +0200 +++ b/src/auth/mech-login.c Sat Jan 08 17:59:49 2005 +0200 @@ -56,8 +56,7 @@ prompt2, strlen(prompt2)); } else { char *pass = p_strndup(unsafe_data_stack_pool, data, data_size); - request->auth->passdb->verify_plain(request, pass, - verify_callback); + auth_request_verify_plain(request, pass, verify_callback); safe_memset(pass, 0, strlen(pass)); } }
--- a/src/auth/mech-ntlm.c Fri Jan 07 23:45:40 2005 +0200 +++ b/src/auth/mech-ntlm.c Sat Jan 08 17:59:49 2005 +0200 @@ -175,9 +175,8 @@ /* NTLM credentials not found or didn't want to use them, try with LM credentials */ - auth_request->auth->passdb-> - lookup_credentials(auth_request, PASSDB_CREDENTIALS_LANMAN, - lm_credentials_callback); + auth_request_lookup_credentials(auth_request, PASSDB_CREDENTIALS_LANMAN, + lm_credentials_callback); } static void @@ -248,10 +247,9 @@ return; } - auth_request->auth->passdb-> - lookup_credentials(auth_request, - PASSDB_CREDENTIALS_NTLM, - ntlm_credentials_callback); + auth_request_lookup_credentials(auth_request, + PASSDB_CREDENTIALS_NTLM, + ntlm_credentials_callback); } }
--- a/src/auth/mech-plain.c Fri Jan 07 23:45:40 2005 +0200 +++ b/src/auth/mech-plain.c Sat Jan 08 17:59:49 2005 +0200 @@ -68,8 +68,8 @@ } auth_request_fail(request); } else { - request->auth->passdb->verify_plain(request, pass, - verify_callback); + auth_request_verify_plain(request, pass, + verify_callback); } /* make sure it's cleared */
--- a/src/auth/mech-rpa.c Fri Jan 07 23:45:40 2005 +0200 +++ b/src/auth/mech-rpa.c Sat Jan 08 17:59:49 2005 +0200 @@ -486,9 +486,8 @@ return; } - auth_request->auth->passdb-> - lookup_credentials(auth_request, PASSDB_CREDENTIALS_RPA, - rpa_credentials_callback); + auth_request_lookup_credentials(auth_request, PASSDB_CREDENTIALS_RPA, + rpa_credentials_callback); } static void
--- a/src/auth/passdb.h Fri Jan 07 23:45:40 2005 +0200 +++ b/src/auth/passdb.h Sat Jan 08 17:59:49 2005 +0200 @@ -1,11 +1,11 @@ #ifndef __PASSDB_H #define __PASSDB_H -#include "mech.h" - #define IS_VALID_PASSWD(pass) \ ((pass)[0] != '\0' && (pass)[0] != '*' && (pass)[0] != '!') +struct auth_request; + enum passdb_credentials { _PASSDB_CREDENTIALS_INTERNAL = -1, @@ -62,4 +62,6 @@ void passdb_init(struct auth *auth); void passdb_deinit(struct auth *auth); +#include "auth-request.h" + #endif
--- a/src/auth/userdb.h Fri Jan 07 23:45:40 2005 +0200 +++ b/src/auth/userdb.h Sat Jan 08 17:59:49 2005 +0200 @@ -1,7 +1,7 @@ #ifndef __USERDB_H #define __USERDB_H -#include "auth-request.h" +struct auth_request; struct user_data { const char *virtual_user; @@ -33,4 +33,6 @@ void userdb_init(struct auth *auth); void userdb_deinit(struct auth *auth); +#include "auth-request.h" + #endif