auth: Fix crypt -> CRYPT in passdb_passwd, passdb_ldap defaults for passdb_default_pa...

diff --git a/src/auth/db-ldap-settings.c b/src/auth/db-ldap-settings.c
index d91fd7f4ea01d4d28611c70dbef5b849613aa427..d9d31ff791aded2e7fb79c765b2cafc22e37754e 100644 (file)
--- a/src/auth/db-ldap-settings.c
+++ b/src/auth/db-ldap-settings.c
@@ -52,9 +52,15 @@ static const struct ldap_settings ldap_default_settings = {
 };
 
 static const struct setting_keyvalue ldap_default_settings_keyvalue[] = {
-       { "passdb_ldap/passdb_default_password_scheme", "crypt" },
        { "passdb_ldap/passdb_fields_import_all", "no" },
        { "userdb_ldap/userdb_fields_import_all", "no" },
+
+       /* This now now the same as the default passdb_default_password_scheme,
+          but it needs to be here explicitly as long as settings-history-core.txt
+          supports dovecot_config_version with
+          passdb_default_password_scheme=PLAIN default */
+       { "passdb_ldap/passdb_default_password_scheme", "CRYPT" },
+
        { NULL, NULL }
 };
 

diff --git a/src/auth/passdb-passwd.c b/src/auth/passdb-passwd.c
index 71f5800cf8bef51caa1d352813fb7e4c9fbe8997..12210e6e0eeeaf20de6a69b2859fe1904dd4505f 100644 (file)
--- a/src/auth/passdb-passwd.c
+++ b/src/auth/passdb-passwd.c
@@ -28,8 +28,14 @@ static const struct setting_define auth_passwd_setting_defines[] = {
 
 static const struct setting_keyvalue auth_passwd_default_settings_keyvalue[] = {
        { "passdb_passwd/passdb_use_worker", "yes" },
-       { "passdb_passwd/passdb_default_password_scheme", "crypt" },
        { "userdb_passwd/userdb_use_worker", "yes" },
+
+       /* This now now the same as the default passdb_default_password_scheme,
+          but it needs to be here explicitly as long as settings-history-core.txt
+          supports dovecot_config_version with
+          passdb_default_password_scheme=PLAIN default */
+       { "passdb_passwd/passdb_default_password_scheme", "CRYPT" },
+
        { NULL, NULL }
 };