dovecot: Changed set_credentials() callback to take a bool succe...
dovecot at dovecot.org
dovecot at dovecot.org
Tue Aug 7 13:19:12 EEST 2007
details: http://hg.dovecot.org/dovecot/rev/e33a87152c41
changeset: 6213:e33a87152c41
user: Timo Sirainen <tss at iki.fi>
date: Tue Aug 07 13:15:28 2007 +0300
description:
Changed set_credentials() callback to take a bool success instead of
enum passdb_result.
diffstat:
6 files changed, 14 insertions(+), 27 deletions(-)
src/auth/auth-worker-client.c | 11 ++---------
src/auth/otp-skey-common.c | 9 +++------
src/auth/otp-skey-common.h | 2 +-
src/auth/passdb-blocking.c | 5 +++--
src/auth/passdb-sql.c | 12 ++++--------
src/auth/passdb.h | 2 +-
diffs (117 lines):
diff -r 6162c80dc9b7 -r e33a87152c41 src/auth/auth-worker-client.c
--- a/src/auth/auth-worker-client.c Tue Aug 07 12:31:58 2007 +0300
+++ b/src/auth/auth-worker-client.c Tue Aug 07 13:15:28 2007 +0300
@@ -262,21 +262,14 @@ auth_worker_handle_passl(struct auth_wor
}
static void
-set_credentials_callback(enum passdb_result result,
- struct auth_request *request)
+set_credentials_callback(bool success, struct auth_request *request)
{
struct auth_worker_client *client = request->context;
string_t *str;
str = t_str_new(64);
- str_printfa(str, "%u\t", request->id);
-
- if (result != PASSDB_RESULT_OK)
- str_printfa(str, "FAIL\t%d\t", result);
- else
- str_printfa(str, "OK\t%s\t", request->user);
- str_append_c(str, '\n');
+ str_printfa(str, "%u\t%s\n", request->id, success ? "OK" : "FAIL");
o_stream_send(client->output, str_data(str), str_len(str));
auth_request_unref(&request);
diff -r 6162c80dc9b7 -r e33a87152c41 src/auth/otp-skey-common.c
--- a/src/auth/otp-skey-common.c Tue Aug 07 12:31:58 2007 +0300
+++ b/src/auth/otp-skey-common.c Tue Aug 07 13:15:28 2007 +0300
@@ -47,17 +47,14 @@ void otp_unlock(struct auth_request *aut
request->lock = FALSE;
}
-void otp_set_credentials_callback(enum passdb_result result,
+void otp_set_credentials_callback(bool success,
struct auth_request *auth_request)
{
- switch (result) {
- case PASSDB_RESULT_OK:
+ if (success)
auth_request_success(auth_request, NULL, 0);
- break;
- default:
+ else {
auth_request_internal_failure(auth_request);
otp_unlock(auth_request);
- break;
}
otp_unlock(auth_request);
diff -r 6162c80dc9b7 -r e33a87152c41 src/auth/otp-skey-common.h
--- a/src/auth/otp-skey-common.h Tue Aug 07 12:31:58 2007 +0300
+++ b/src/auth/otp-skey-common.h Tue Aug 07 13:15:28 2007 +0300
@@ -15,7 +15,7 @@ int otp_try_lock(struct auth_request *au
int otp_try_lock(struct auth_request *auth_request);
void otp_unlock(struct auth_request *auth_request);
-void otp_set_credentials_callback(enum passdb_result result,
+void otp_set_credentials_callback(bool success,
struct auth_request *auth_request);
void mech_otp_skey_auth_free(struct auth_request *auth_request);
diff -r 6162c80dc9b7 -r e33a87152c41 src/auth/passdb-blocking.c
--- a/src/auth/passdb-blocking.c Tue Aug 07 12:31:58 2007 +0300
+++ b/src/auth/passdb-blocking.c Tue Aug 07 13:15:28 2007 +0300
@@ -161,9 +161,10 @@ static void
static void
set_credentials_callback(struct auth_request *request, const char *reply)
{
- enum passdb_result result = check_failure(request, &reply);
+ bool success;
- request->private_callback.set_credentials(result, request);
+ success = strcmp(reply, "OK") == 0 || strncmp(reply, "OK\t", 3) == 0;
+ request->private_callback.set_credentials(success, request);
}
void passdb_blocking_set_credentials(struct auth_request *request,
diff -r 6162c80dc9b7 -r e33a87152c41 src/auth/passdb-sql.c
--- a/src/auth/passdb-sql.c Tue Aug 07 12:31:58 2007 +0300
+++ b/src/auth/passdb-sql.c Tue Aug 07 13:15:28 2007 +0300
@@ -185,18 +185,14 @@ static void sql_set_credentials_callback
static void sql_set_credentials_callback(const char *error,
struct passdb_sql_request *sql_request)
{
- enum passdb_result result;
-
- if (error == NULL)
- result = PASSDB_RESULT_OK;
- else {
- result = PASSDB_RESULT_INTERNAL_FAILURE;
+ if (error != NULL) {
auth_request_log_error(sql_request->auth_request, "sql",
"Set credentials query failed: %s",
error);
}
- sql_request->callback.set_credentials(result,
- sql_request->auth_request);
+
+ sql_request->callback.
+ set_credentials(error == NULL, sql_request->auth_request);
i_free(sql_request);
}
diff -r 6162c80dc9b7 -r e33a87152c41 src/auth/passdb.h
--- a/src/auth/passdb.h Tue Aug 07 12:31:58 2007 +0300
+++ b/src/auth/passdb.h Tue Aug 07 13:15:28 2007 +0300
@@ -24,7 +24,7 @@ typedef void lookup_credentials_callback
const unsigned char *credentials,
size_t size,
struct auth_request *request);
-typedef void set_credentials_callback_t(enum passdb_result result,
+typedef void set_credentials_callback_t(bool success,
struct auth_request *request);
struct passdb_module_interface {
More information about the dovecot-cvs
mailing list