X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Ftincd.c;h=5b6b32940fb737491ec55f52c2653393ed6ed7c0;hp=db6b213aa1a67fc94cdab4e4fed14f55a89dd6f5;hb=21e7eb0afb3b5f332a90b9ed63d6770db791ecb1;hpb=3fae14fae5a347823679ef694ab630b4991a201d

diff --git a/src/tincd.c b/src/tincd.c
index db6b213a..5b6b3294 100644
--- a/src/tincd.c
+++ b/src/tincd.c
@@ -658,8 +658,6 @@ int main(int argc, char **argv) {
 		return 1;
 	}
 
-	make_names();
-
 	if(show_version) {
 		printf("%s version %s\n", PACKAGE, VERSION);
 		printf("Copyright (C) 1998-2017 Ivo Timmermans, Guus Sliepen and others.\n"
@@ -676,6 +674,8 @@ int main(int argc, char **argv) {
 		return 0;
 	}
 
+	make_names();
+
 	if(kill_tincd) {
 		return !kill_other(kill_tincd);
 	}
@@ -821,14 +821,8 @@ end:
 	free(priority);
 
 	EVP_cleanup();
-	ENGINE_cleanup();
-	CRYPTO_cleanup_all_ex_data();
-#ifdef HAVE_ERR_REMOVE_STATE
-	// OpenSSL claims this function was deprecated in 1.0.0,
-	// but valgrind's leak detector shows you still need to call it to make sure OpenSSL cleans up properly.
-	ERR_remove_state(0);
-#endif
 	ERR_free_strings();
+	ENGINE_cleanup();
 
 	exit_configuration(&config_tree);
 	list_delete_list(cmdline_conf);