auth: Remove passdb_auth_verbose and userdb_auth_verbose settings

It's now possible to use the global auth_verbose setting inside passdb and
userdb filters.

diff --git a/src/auth/auth-request.c b/src/auth/auth-request.c
index 206ca5329e11c33fb0ead33e57229850c54d58a6..f2e48c7adcad85f184796a1d312223d879dc1869 100644 (file)
--- a/src/auth/auth-request.c
+++ b/src/auth/auth-request.c
@@ -687,10 +687,8 @@ void auth_request_passdb_lookup_begin(struct auth_request *request)
                auth_request_get_log_prefix_db, request);
 
        /* check if we should enable verbose logging here */
-       if (*request->passdb->set->auth_verbose == 'y')
-               event_set_min_log_level(event, LOG_TYPE_INFO);
-       else if (*request->passdb->set->auth_verbose == 'n')
-               event_set_min_log_level(event, LOG_TYPE_WARNING);
+       event_set_min_log_level(event, request->passdb->auth_set->verbose ?
+                               LOG_TYPE_INFO : LOG_TYPE_WARNING);
 
        e_debug(event_create_passthrough(event)->
                        set_name("auth_passdb_request_started")->
@@ -741,10 +739,8 @@ void auth_request_userdb_lookup_begin(struct auth_request *request)
                auth_request_get_log_prefix_db, request);
 
        /* check if we should enable verbose logging here*/
-       if (*request->userdb->set->auth_verbose == 'y')
-               event_set_min_log_level(event, LOG_TYPE_INFO);
-       else if (*request->userdb->set->auth_verbose == 'n')
-               event_set_min_log_level(event, LOG_TYPE_WARNING);
+       event_set_min_log_level(event, request->userdb->auth_set->verbose ?
+                               LOG_TYPE_INFO : LOG_TYPE_WARNING);
 
        e_debug(event_create_passthrough(event)->
                        set_name("auth_userdb_request_started")->

diff --git a/src/auth/auth-settings.c b/src/auth/auth-settings.c
index 26d598792169d5ea8fc3bee95e0db2587a89274d..2299f35eeb6e165ebac59e91429db6dc3b38126e 100644 (file)
--- a/src/auth/auth-settings.c
+++ b/src/auth/auth-settings.c
@@ -118,7 +118,6 @@ static const struct setting_define auth_passdb_setting_defines[] = {
 
        DEF(BOOL, deny),
        DEF(BOOL, master),
-       DEF(ENUM, auth_verbose),
 
        SETTING_DEFINE_LIST_END
 };
@@ -139,7 +138,6 @@ static const struct auth_passdb_settings auth_passdb_default_settings = {
 
        .deny = FALSE,
        .master = FALSE,
-       .auth_verbose = "default:yes:no"
 };
 
 const struct setting_parser_info auth_passdb_setting_parser_info = {
@@ -170,8 +168,6 @@ static const struct setting_define auth_userdb_setting_defines[] = {
        DEF(ENUM, result_failure),
        DEF(ENUM, result_internalfail),
 
-       DEF(ENUM, auth_verbose),
-
        SETTING_DEFINE_LIST_END
 };
 
@@ -187,8 +183,6 @@ static const struct auth_userdb_settings auth_userdb_default_settings = {
        .result_success = "return-ok:return:return-fail:continue:continue-ok:continue-fail",
        .result_failure = "continue:return:return-ok:return-fail:continue-ok:continue-fail",
        .result_internalfail = "continue:return:return-ok:return-fail:continue-ok:continue-fail",
-
-       .auth_verbose = "default:yes:no"
 };
 
 const struct setting_parser_info auth_userdb_setting_parser_info = {

diff --git a/src/auth/auth-settings.h b/src/auth/auth-settings.h
index 0c72d0fe44df0816feff3c735031dae64f79f5c3..2ee0f0d58ef8523f949bc25daefd2e493a5e2ece 100644 (file)
--- a/src/auth/auth-settings.h
+++ b/src/auth/auth-settings.h
@@ -20,7 +20,6 @@ struct auth_passdb_settings {
        const char *result_internalfail;
        bool deny;
        bool master;
-       const char *auth_verbose;
 };
 
 struct auth_userdb_settings {
@@ -35,7 +34,6 @@ struct auth_userdb_settings {
        const char *result_success;
        const char *result_failure;
        const char *result_internalfail;
-       const char *auth_verbose;
 };
 
 struct auth_settings {

diff --git a/src/auth/auth.c b/src/auth/auth.c
index 9aba873d5d7dccb7404cd5e67f59c575b034d7ed..c8117bf2511fed7b75e053b0fc8fee6b46651e15 100644 (file)
--- a/src/auth/auth.c
+++ b/src/auth/auth.c
@@ -32,8 +32,6 @@ static const struct auth_userdb_settings userdb_dummy_set = {
        .result_success = "return-ok",
        .result_failure = "continue",
        .result_internalfail = "continue",
-
-       .auth_verbose = "default",
 };
 
 ARRAY_TYPE(auth) auths;

diff --git a/src/auth/test-mock.c b/src/auth/test-mock.c
index 22dfc7f089df656da8294ba3c21b4536799955cc..f2cb70fa4abc2f0243459fba1bfbc7ca57ff35eb 100644 (file)
--- a/src/auth/test-mock.c
+++ b/src/auth/test-mock.c
@@ -57,7 +57,6 @@ struct auth_passdb_settings mock_passdb_set = {
        .result_internalfail = "continue",
        .deny = FALSE,
        .master = FALSE,
-       .auth_verbose = "default"
 };
 
 void passdb_mock_mod_init(void)
@@ -85,7 +84,6 @@ void passdb_mock_mod_init(void)
 
                .deny = FALSE,
                .master = FALSE,
-               .auth_verbose = "default"
        };
        mock_passdb_mod = passdb_preinit(mock_pool, &set);
        passdb_init(mock_passdb_mod);