auth: Add and use auth_passdb.name & auth_userdb.name

diff --git a/src/auth/auth-request.c b/src/auth/auth-request.c
index de56cac779805c55a4f19d5445236f5e1ab0b489..3fb656c1b915204daa87915ab037d1c5da07e9de 100644 (file)
--- a/src/auth/auth-request.c
+++ b/src/auth/auth-request.c
@@ -114,10 +114,10 @@ const char *auth_request_get_log_prefix_db(struct auth_request *auth_request)
 
        if (!auth_request->userdb_lookup) {
                i_assert(auth_request->passdb != NULL);
-               name = auth_request->passdb->set->name;
+               name = auth_request->passdb->name;
        } else {
                i_assert(auth_request->userdb != NULL);
-               name = auth_request->userdb->set->name;
+               name = auth_request->userdb->name;
        }
 
        return t_strconcat(name, ": ", NULL);
@@ -676,7 +676,7 @@ void auth_request_passdb_lookup_begin(struct auth_request *request)
        request->set = request->passdb->auth_set;
 
        event = event_create(request->event);
-       event_add_str(event, "passdb", request->passdb->set->name);
+       event_add_str(event, "passdb", request->passdb->name);
        event_add_str(event, "passdb_id", dec2str(request->passdb->passdb->id));
        event_add_str(event, "passdb_driver", request->passdb->passdb->iface.name);
        event_set_log_prefix_callback(event, FALSE,
@@ -728,7 +728,7 @@ void auth_request_userdb_lookup_begin(struct auth_request *request)
        request->set = request->userdb->auth_set;
 
        event = event_create(request->event);
-       event_add_str(event, "userdb", request->userdb->set->name);
+       event_add_str(event, "userdb", request->userdb->name);
        event_add_str(event, "userdb_id", dec2str(request->userdb->userdb->id));
        event_add_str(event, "userdb_driver", request->userdb->userdb->iface->name);
        event_set_log_prefix_callback(event, FALSE,

diff --git a/src/auth/auth.c b/src/auth/auth.c
index c8117bf2511fed7b75e053b0fc8fee6b46651e15..ed65e80de3956ffa0613e630bdfe25a2da5f989a 100644 (file)
--- a/src/auth/auth.c
+++ b/src/auth/auth.c
@@ -94,6 +94,7 @@ auth_passdb_preinit(struct auth *auth, const struct auth_passdb_settings *set,
                settings_get_or_fatal(event, &auth_setting_parser_info);
        event_unref(&event);
 
+       auth_passdb->name = set->name;
        auth_passdb->set = set;
        auth_passdb->skip = auth_passdb_skip_parse(set->skip);
        auth_passdb->result_success =
@@ -162,6 +163,7 @@ auth_userdb_preinit(struct auth *auth, const struct auth_userdb_settings *set)
                settings_get_or_fatal(event, &auth_setting_parser_info);
        event_unref(&event);
 
+       auth_userdb->name = set->name;
        auth_userdb->set = set;
        auth_userdb->skip = auth_userdb_skip_parse(set->skip);
        auth_userdb->result_success =

diff --git a/src/auth/auth.h b/src/auth/auth.h
index 34ffae116848f25a70bf37564c79803177871cd6..badde58b12c573b5e7373659d99b8457392a88df 100644 (file)
--- a/src/auth/auth.h
+++ b/src/auth/auth.h
@@ -32,6 +32,7 @@ enum auth_db_rule {
 struct auth_passdb {
        struct auth_passdb *next;
 
+       const char *name;
        const struct auth_settings *auth_set;
        const struct auth_passdb_settings *set;
        struct passdb_module *passdb;
@@ -56,6 +57,7 @@ struct auth_passdb {
 struct auth_userdb {
        struct auth_userdb *next;
 
+       const char *name;
        const struct auth_settings *auth_set;
        const struct auth_userdb_settings *set;
        struct userdb_module *userdb;

diff --git a/src/auth/test-mock.c b/src/auth/test-mock.c
index f2cb70fa4abc2f0243459fba1bfbc7ca57ff35eb..047aac4302efabf454cf9a3bd0558b6c57259df2 100644 (file)
--- a/src/auth/test-mock.c
+++ b/src/auth/test-mock.c
@@ -99,7 +99,7 @@ void passdb_mock_mod_deinit(void)
 struct auth_passdb *passdb_mock(void)
 {
        struct auth_passdb *ret = i_new(struct auth_passdb, 1);
-       ret->set = &mock_passdb_set;
+       ret->name = "mock";
        ret->passdb = mock_passdb_mod;
        return ret;
 }