auth: Add passdb_default_password_scheme and passdb_use_worker settings

These will be used by passdbs as they are converted to new settings.

diff --git a/src/auth/auth-settings.c b/src/auth/auth-settings.c
index 7a3f9bd2db8ccb05f22700df111609a49d23be5c..9af7c32f42ae61f8e557868eb8c9e036f47d081c 100644 (file)
--- a/src/auth/auth-settings.c
+++ b/src/auth/auth-settings.c
@@ -109,6 +109,8 @@ static const struct setting_define auth_passdb_setting_defines[] = {
        DEF(BOOLLIST, mechanisms),
        DEF(STR, username_filter),
 
+       DEF(STR, default_password_scheme),
+
        DEF(ENUM, skip),
        DEF(ENUM, result_success),
        DEF(ENUM, result_failure),
@@ -116,6 +118,7 @@ static const struct setting_define auth_passdb_setting_defines[] = {
 
        DEF(BOOL, deny),
        DEF(BOOL, master),
+       DEF(BOOL, use_worker),
 
        SETTING_DEFINE_LIST_END
 };
@@ -127,6 +130,8 @@ static const struct auth_passdb_settings auth_passdb_default_settings = {
        .mechanisms = ARRAY_INIT,
        .username_filter = "",
 
+       .default_password_scheme = "PLAIN",
+
        .skip = "never:authenticated:unauthenticated",
        .result_success = "return-ok:return:return-fail:continue:continue-ok:continue-fail",
        .result_failure = "continue:return:return-ok:return-fail:continue-ok:continue-fail",
@@ -134,6 +139,7 @@ static const struct auth_passdb_settings auth_passdb_default_settings = {
 
        .deny = FALSE,
        .master = FALSE,
+       .use_worker = FALSE,
 };
 
 const struct setting_parser_info auth_passdb_setting_parser_info = {

diff --git a/src/auth/auth-settings.h b/src/auth/auth-settings.h
index afafa9ff5b4ea5fb50bd29f656f22136a2488242..f6dd1ef99291237b96c8896a2a61d50bfc2ecc7a 100644 (file)
--- a/src/auth/auth-settings.h
+++ b/src/auth/auth-settings.h
@@ -22,12 +22,15 @@ struct auth_passdb_settings {
        ARRAY_TYPE(const_string) mechanisms;
        const char *username_filter;
 
+       const char *default_password_scheme;
+
        const char *skip;
        const char *result_success;
        const char *result_failure;
        const char *result_internalfail;
        bool deny;
        bool master;
+       bool use_worker;
 };
 
 struct auth_userdb_pre_settings {