Skip to content

Commit

Permalink
global: Remove random_init/random_deinit calls
Browse files Browse the repository at this point in the history
lib already initializes it.
  • Loading branch information
cmouse authored and Timo Sirainen committed Sep 7, 2017
1 parent 21f76ca commit 9e0f35d
Show file tree
Hide file tree
Showing 14 changed files with 0 additions and 29 deletions.
4 changes: 0 additions & 4 deletions src/auth/main.c
Expand Up @@ -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();
Expand Down Expand Up @@ -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)
Expand Down
5 changes: 0 additions & 5 deletions src/dict/main.c
Expand Up @@ -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();
Expand Down Expand Up @@ -131,7 +127,6 @@ static void main_deinit(void)
module_dir_unload(&modules);

sql_drivers_deinit();
random_deinit();
}

int main(int argc, char *argv[])
Expand Down
2 changes: 0 additions & 2 deletions src/doveadm/doveadm-pw.c
Expand Up @@ -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);
Expand Down Expand Up @@ -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 = {
Expand Down
2 changes: 0 additions & 2 deletions src/imap-urlauth/imap-urlauth-worker.c
Expand Up @@ -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);
Expand Down Expand Up @@ -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;
}
2 changes: 0 additions & 2 deletions src/imap/main.c
Expand Up @@ -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);
Expand Down Expand Up @@ -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;
}
2 changes: 0 additions & 2 deletions src/lib-dcrypt/test-crypto.c
Expand Up @@ -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;
Expand Down Expand Up @@ -786,7 +785,6 @@ int main(void) {
int ret = test_run(test_functions);

dcrypt_deinitialize();
random_deinit();

return ret;
}
1 change: 0 additions & 1 deletion src/lib-dcrypt/test-stream.c
Expand Up @@ -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));
Expand Down
1 change: 0 additions & 1 deletion src/login-common/main.c
Expand Up @@ -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();
Expand Down
2 changes: 0 additions & 2 deletions src/plugins/apparmor/apparmor-plugin.c
Expand Up @@ -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);
}
2 changes: 0 additions & 2 deletions src/plugins/mail-crypt/fs-crypt-common.c
Expand Up @@ -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);

Expand Down Expand Up @@ -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 *
Expand Down
2 changes: 0 additions & 2 deletions src/plugins/mail-crypt/mail-crypt-plugin.c
Expand Up @@ -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);
Expand All @@ -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();
}
1 change: 0 additions & 1 deletion src/plugins/mail-crypt/test-mail-global-key.c
Expand Up @@ -125,7 +125,6 @@ int main(void)
NULL
};

random_init();
int ret = test_run(tests);
return ret;
}
1 change: 0 additions & 1 deletion src/plugins/mail-crypt/test-mail-key.c
Expand Up @@ -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;
Expand Down
2 changes: 0 additions & 2 deletions src/plugins/var-expand-crypt/test-var-expand-crypt.c
Expand Up @@ -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;
Expand Down Expand Up @@ -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();
}
Expand Down

0 comments on commit 9e0f35d

Please sign in to comment.