global: Remove random_init/random_deinit calls

lib already initializes it.

diff --git a/src/auth/main.c b/src/auth/main.c
index 688eae0917419568f31be33ca495d107defd751a..94d57c63e1c8b81bb5963cf00f4d7b42b16f674f 100644 (file)
--- a/src/auth/main.c
+++ b/src/auth/main.c
@@ -173,9 +173,6 @@ static void main_preinit(void)
        struct module_dir_load_settings mod_set;
        const char *const *services;
 
-       /* Open /dev/urandom before chrooting */
-       random_init();
-
        /* Load built-in SQL drivers (if any) */
        sql_drivers_init();
        sql_drivers_register_all();
@@ -301,7 +298,6 @@ static void main_deinit(void)
        auth_request_stats_deinit();
 
        sql_drivers_deinit();
-       random_deinit();
        child_wait_deinit();
 
        array_foreach_modifiable(&listeners, l)

diff --git a/src/dict/main.c b/src/dict/main.c
index a68f2176fc3fc40465dab6c90dc2fc71f67a97b2..536737e8cce15d586f8d3554832633859468a784 100644 (file)
--- a/src/dict/main.c
+++ b/src/dict/main.c
@@ -77,10 +77,6 @@ static void client_connected(struct master_service_connection *conn)
 
 static void main_preinit(void)
 {
-       /* Maybe needed. Have to open /dev/urandom before possible
-          chrooting. */
-       random_init();
-
        /* Load built-in SQL drivers (if any) */
        sql_drivers_init();
        sql_drivers_register_all();
@@ -131,7 +127,6 @@ static void main_deinit(void)
        module_dir_unload(&modules);
 
        sql_drivers_deinit();
-       random_deinit();
 }
 
 int main(int argc, char *argv[])

diff --git a/src/doveadm/doveadm-pw.c b/src/doveadm/doveadm-pw.c
index ec24f9b9ea9e4364f32736bef7cb025f8b17597e..c1c0f90bfcb7b6d050bb6548a238e2afa28d163a 100644 (file)
--- a/src/doveadm/doveadm-pw.c
+++ b/src/doveadm/doveadm-pw.c
@@ -29,7 +29,6 @@ static void cmd_pw(int argc, char *argv[])
        int c;
        struct module_dir_load_settings mod_set;
 
-       random_init();
        password_schemes_init();
 
        i_zero(&mod_set);
@@ -139,7 +138,6 @@ static void cmd_pw(int argc, char *argv[])
 
        module_dir_unload(&modules);
        password_schemes_deinit();
-       random_deinit();
 }
 
 struct doveadm_cmd doveadm_cmd_pw = {

diff --git a/src/imap-urlauth/imap-urlauth-worker.c b/src/imap-urlauth/imap-urlauth-worker.c
index a3c9e8938f3dee150803921ac88a98f90644f737..3036cbed6de74683fc49c11fbc59ef867caebdf1 100644 (file)
--- a/src/imap-urlauth/imap-urlauth-worker.c
+++ b/src/imap-urlauth/imap-urlauth-worker.c
@@ -1003,7 +1003,6 @@ int main(int argc, char *argv[])
                                t_strdup_printf("imap-urlauth[%s]: ", my_pid));
        master_service_set_die_callback(master_service, imap_urlauth_worker_die);
 
-       random_init();
        storage_service =
                mail_storage_service_init(master_service,
                                          set_roots, storage_service_flags);
@@ -1031,7 +1030,6 @@ int main(int argc, char *argv[])
        clients_destroy_all();
 
        mail_storage_service_deinit(&storage_service);
-       random_deinit();
        master_service_deinit(&master_service);
        return 0;
 }

diff --git a/src/imap/main.c b/src/imap/main.c
index 479e8ea59df3a794c2b07c546ecb18e673beb7b7..6b2fd178d7fa897b63018fb2e25b806040d0e146 100644 (file)
--- a/src/imap/main.c
+++ b/src/imap/main.c
@@ -468,7 +468,6 @@ int main(int argc, char *argv[])
        imap_fetch_handlers_init();
        imap_master_clients_init();
 
-       random_init();
        storage_service =
                mail_storage_service_init(master_service,
                                          set_roots, storage_service_flags);
@@ -514,7 +513,6 @@ int main(int argc, char *argv[])
        commands_deinit();
        imap_master_clients_deinit();
 
-       random_deinit();
        master_service_deinit(&master_service);
        return 0;
 }

diff --git a/src/lib-dcrypt/test-crypto.c b/src/lib-dcrypt/test-crypto.c
index 40e290dc909855bcf68a60fef5c8fe587068f611..2761afdfaf5797e1cf8aecb8f85ed0ef7863840c 100644 (file)
--- a/src/lib-dcrypt/test-crypto.c
+++ b/src/lib-dcrypt/test-crypto.c
@@ -757,7 +757,6 @@ int main(void) {
        };
        const char *error;
 
-       random_init();
        if (!dcrypt_initialize(NULL, &set, &error)) {
                i_error("No functional dcrypt backend found - skipping tests: %s", error);
                return 0;
@@ -786,7 +785,6 @@ int main(void) {
        int ret = test_run(test_functions);
 
        dcrypt_deinitialize();
-       random_deinit();
 
        return ret;
 }

diff --git a/src/lib-dcrypt/test-stream.c b/src/lib-dcrypt/test-stream.c
index a39602cfcece7d21d07ddf6da07058cfdc30ffd0..2154f378d3c891571c213480b2b0cf1e02579002 100644 (file)
--- a/src/lib-dcrypt/test-stream.c
+++ b/src/lib-dcrypt/test-stream.c
@@ -533,7 +533,6 @@ int main(void) {
                i_error("No functional dcrypt backend found - skipping tests: %s", error);
                return 0;
        }
-       random_init();
 
        test_assert(dcrypt_key_load_private(&test_v1_kp.priv, key_v1_priv, NULL, NULL, NULL));
        test_assert(dcrypt_key_load_public(&test_v1_kp.pub, key_v1_pub, NULL));

diff --git a/src/login-common/main.c b/src/login-common/main.c
index 3e5077001791842fd2b5d9cd425d84e49320932b..ff009fe13e5c582133565ec0551344462f973eea 100644 (file)
--- a/src/login-common/main.c
+++ b/src/login-common/main.c
@@ -341,7 +341,6 @@ static void main_preinit(void)
 {
        unsigned int max_fds;
 
-       random_init();
        /* Initialize SSL proxy so it can read certificate and private
           key file. */
        ssl_proxy_init();

diff --git a/src/plugins/apparmor/apparmor-plugin.c b/src/plugins/apparmor/apparmor-plugin.c
index a119f82fbfbf41a52fcf5af54ac0c30486d3138e..e755484e70fe40ff3af3cbbc374bfae42deae53c 100644 (file)
--- a/src/plugins/apparmor/apparmor-plugin.c
+++ b/src/plugins/apparmor/apparmor-plugin.c
@@ -103,12 +103,10 @@ static const struct mail_storage_hooks apparmor_hooks = {
 
 void apparmor_plugin_init(struct module *module)
 {
-       random_init();
        mail_storage_hooks_add(module, &apparmor_hooks);
 }
 
 void apparmor_plugin_deinit(void)
 {
-       random_deinit();
        mail_storage_hooks_remove(&apparmor_hooks);
 }

diff --git a/src/plugins/mail-crypt/fs-crypt-common.c b/src/plugins/mail-crypt/fs-crypt-common.c
index c3e5c9ae1eed0cca86fb1c5abb3d4f576d06579d..058f060425e55fb6e293da8c06d01c4f259803f5 100644 (file)
--- a/src/plugins/mail-crypt/fs-crypt-common.c
+++ b/src/plugins/mail-crypt/fs-crypt-common.c
@@ -62,7 +62,6 @@ fs_crypt_init(struct fs *_fs, const char *args, const
        const char *p, *arg, *value, *error, *parent_name, *parent_args;
        const char *public_key_path = "", *private_key_path = "", *password = "";
 
-       random_init();
        if (!dcrypt_initialize("openssl", NULL, &error))
                i_fatal("dcrypt_initialize(): %s", error);
 
@@ -131,7 +130,6 @@ static void fs_crypt_deinit(struct fs *_fs)
        i_free(fs->private_key_path);
        i_free(fs->password);
        i_free(fs);
-       random_deinit();
 }
 
 static struct fs_file *

diff --git a/src/plugins/mail-crypt/mail-crypt-plugin.c b/src/plugins/mail-crypt/mail-crypt-plugin.c
index d50d7decf5cec29a5baffa7d452033cfcd25dbff..45017cf4f9c7fa3d99f45f6b8a26ba230b5563c4 100644 (file)
--- a/src/plugins/mail-crypt/mail-crypt-plugin.c
+++ b/src/plugins/mail-crypt/mail-crypt-plugin.c
@@ -468,7 +468,6 @@ static struct module crypto_post_module = {
 void mail_crypt_plugin_init(struct module *module)
 {
        const char* error;
-       random_init();
        if (!dcrypt_initialize("openssl", NULL, &error))
                i_fatal("dcrypt_initialize(): %s", error);
        mail_storage_hooks_add(module, &mail_crypt_mail_storage_hooks);
@@ -485,5 +484,4 @@ void mail_crypt_plugin_deinit(void)
 {
        mail_storage_hooks_remove(&mail_crypt_mail_storage_hooks);
        mail_storage_hooks_remove(&mail_crypt_mail_storage_hooks_post);
-       random_deinit();
 }

diff --git a/src/plugins/mail-crypt/test-mail-global-key.c b/src/plugins/mail-crypt/test-mail-global-key.c
index 590d70d3789c306a34b486af0a7c7c1b20b5202e..3cb1cb2e92206c658efd921736f17ea31546949a 100644 (file)
--- a/src/plugins/mail-crypt/test-mail-global-key.c
+++ b/src/plugins/mail-crypt/test-mail-global-key.c
@@ -125,7 +125,6 @@ int main(void)
                NULL
        };
 
-       random_init();
        int ret = test_run(tests);
        return ret;
 }

diff --git a/src/plugins/mail-crypt/test-mail-key.c b/src/plugins/mail-crypt/test-mail-key.c
index fa1287ac7da41a9c301f9c16485d1b49e6cdcc30..4db1c85dbc81ceff9e8fdbc62237f4c0dd26b7a5 100644 (file)
--- a/src/plugins/mail-crypt/test-mail-key.c
+++ b/src/plugins/mail-crypt/test-mail-key.c
@@ -491,7 +491,6 @@ int main(int argc, char **argv)
                                             MASTER_SERVICE_FLAG_NO_SSL_INIT |
                                             MASTER_SERVICE_FLAG_NO_INIT_DATASTACK_FRAME,
                                             &argc, &argv, "");
-       random_init();
        int ret = test_run(tests);
        master_service_deinit(&master_service);
        return ret;

diff --git a/src/plugins/var-expand-crypt/test-var-expand-crypt.c b/src/plugins/var-expand-crypt/test-var-expand-crypt.c
index acf862deafae6569f89bc7034b0480e8d37b998b..17a7127072e996c8ab937c20aa42c2448600b699 100644 (file)
--- a/src/plugins/var-expand-crypt/test-var-expand-crypt.c
+++ b/src/plugins/var-expand-crypt/test-var-expand-crypt.c
@@ -43,7 +43,6 @@ static void test_var_expand_crypt(void)
 
        test_begin("var_expand_crypt");
        var_expand_crypt_init(NULL);
-       random_init();
 
        for(i=0; i < N_ELEMENTS(test_cases); i++) T_BEGIN {
                const char *error;
@@ -77,7 +76,6 @@ static void test_var_expand_crypt(void)
                test_assert_idx(strcmp(str_c(output), table[4].value)==0, i);
        };
 
-       random_deinit();
        var_expand_crypt_deinit();
        test_end();
 }