auth: Rename auth_request_verify_plain_callback() to auth_request_verify_plain_passdb...

Pure rename. The callback is invoked from passdb verification paths
(both blocking-worker and direct), so the new name better describes
where it sits in the call chain and disambiguates it from
auth_request_verify_plain_callback_finish().

diff --git a/src/auth/auth-request.c b/src/auth/auth-request.c
index 313feedb95c47eb0dab8388fece427b8139084f0..a302a50be46ee96be79cf346905b708cad5e633e 100644 (file)
--- a/src/auth/auth-request.c
+++ b/src/auth/auth-request.c
@@ -1095,7 +1095,7 @@ auth_request_verify_plain_callback_finish(enum passdb_result result,
        }
 }
 
-void auth_request_verify_plain_callback(enum passdb_result result,
+void auth_request_verify_plain_passdb_callback(enum passdb_result result,
                                        struct auth_request *request)
 {
        struct auth_passdb *passdb = request->passdb;
@@ -1292,13 +1292,13 @@ void auth_request_default_verify_plain_continue(
        if (passdb->passdb->iface.verify_plain == NULL) {
                /* we're deinitializing and just want to get rid of this
                   request */
-               auth_request_verify_plain_callback(
+               auth_request_verify_plain_passdb_callback(
                        PASSDB_RESULT_INTERNAL_FAILURE, request);
        } else if (passdb->passdb->blocking) {
                passdb_blocking_verify_plain(request);
        } else {
                passdb->passdb->iface.verify_plain(
-                       request, password, auth_request_verify_plain_callback);
+                       request, password, auth_request_verify_plain_passdb_callback);
        }
 }
 

diff --git a/src/auth/auth-request.h b/src/auth/auth-request.h
index f8cb1b1a4034f7ce4b7fe1bda7ffb7c1ce7aa302..a34e1a9910e4deaf06a0da46dbe00c171e13d713 100644 (file)
--- a/src/auth/auth-request.h
+++ b/src/auth/auth-request.h
@@ -408,7 +408,7 @@ void auth_request_db_log_login_failure(struct auth_request *request,
 void
 auth_request_verify_plain_callback_finish(enum passdb_result result,
                                           struct auth_request *request);
-void auth_request_verify_plain_callback(enum passdb_result result,
+void auth_request_verify_plain_passdb_callback(enum passdb_result result,
                                        struct auth_request *request);
 void auth_request_lookup_credentials_callback(enum passdb_result result,
                                              const unsigned char *credentials,

diff --git a/src/auth/passdb-blocking.c b/src/auth/passdb-blocking.c
index 2ccb5692349eb4eb5d039fd3ade54fb275da4075..87fe8620ee61b966ed1256a96c412100a4ee45ff 100644 (file)
--- a/src/auth/passdb-blocking.c
+++ b/src/auth/passdb-blocking.c
@@ -79,7 +79,7 @@ verify_plain_callback(struct auth_worker_connection *conn ATTR_UNUSED,
        enum passdb_result result;
 
        result = passdb_blocking_auth_worker_reply_parse(request, args);
-       auth_request_verify_plain_callback(result, request);
+       auth_request_verify_plain_passdb_callback(result, request);
        auth_request_unref(&request);
        return TRUE;
 }