lib-auth: Add password_schemes_register_all()

diff --git a/src/lib-auth/password-scheme-crypt.c b/src/lib-auth/password-scheme-crypt.c
index 8fafe1a044128b57301d8ec43b95d82f600eaf66..e1de1c5047f6d99dc7bb0cb4b654e878561aa1d7 100644 (file)
--- a/src/lib-auth/password-scheme-crypt.c
+++ b/src/lib-auth/password-scheme-crypt.c
@@ -254,3 +254,12 @@ void password_scheme_register_crypt(void)
        password_scheme_register(&blf_crypt_scheme);
        password_scheme_register(&default_crypt_scheme);
 }
+
+void password_schemes_register_all(void)
+{
+       password_schemes_init();
+       password_scheme_register_crypt();
+#ifdef HAVE_LIBSODIUM
+       password_scheme_register_sodium();
+#endif
+}

diff --git a/src/lib-auth/password-scheme.c b/src/lib-auth/password-scheme.c
index 17f626610ddc52cc1d4e728ceffa835460625de0..40a0ebb5d770130e02bc5fc1215fc9493edcc04e 100644 (file)
--- a/src/lib-auth/password-scheme.c
+++ b/src/lib-auth/password-scheme.c
@@ -942,10 +942,6 @@ void password_schemes_init(void)
                          strcasecmp);
        for (i = 0; i < N_ELEMENTS(builtin_schemes); i++)
                password_scheme_register(&builtin_schemes[i]);
-       password_scheme_register_crypt();
-#ifdef HAVE_LIBSODIUM
-       password_scheme_register_sodium();
-#endif
 }
 
 void password_schemes_deinit(void)

diff --git a/src/lib-auth/password-scheme.h b/src/lib-auth/password-scheme.h
index 7307a60fad0c55e333a8f36aff6381b73a18dbcc..e45c7a981da3760af5278c5211b4248ce234a8d8 100644 (file)
--- a/src/lib-auth/password-scheme.h
+++ b/src/lib-auth/password-scheme.h
@@ -85,6 +85,9 @@ void password_scheme_register(const struct password_scheme *scheme);
 void password_scheme_unregister(const struct password_scheme *scheme);
 
 void password_schemes_init(void);
+/* Calls password_schemes_init, the difference is that this
+   will attempt to register also crypt and sodium schemes. */
+void password_schemes_register_all(void);
 void password_schemes_allow_weak(bool allow);
 void password_schemes_deinit(void);
 

diff --git a/src/lib-auth/test-password-scheme.c b/src/lib-auth/test-password-scheme.c
index f4a7828485d07eaff6352b0ba8ed0378be8d0ab5..ec24bf4b96d0b646e8d9f80863c36276ddb7d45e 100644 (file)
--- a/src/lib-auth/test-password-scheme.c
+++ b/src/lib-auth/test-password-scheme.c
@@ -134,7 +134,7 @@ int main(void)
                test_password_failures,
                NULL
        };
-       password_schemes_init();
+       password_schemes_register_all();
        password_schemes_allow_weak(TRUE);
        return test_run(test_functions);
 }