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

diff --git a/src/tincd.c b/src/tincd.c
index db6b213a..279c8723 100644
--- a/src/tincd.c
+++ b/src/tincd.c
@@ -363,6 +363,8 @@ static bool parse_options(int argc, char **argv) {
 /* This function prettyprints the key generation process */
 
 static int indicator(int a, int b, BN_GENCB *cb) {
+	(void)cb;
+
 	switch(a) {
 	case 0:
 		fprintf(stderr, ".");
@@ -536,7 +538,7 @@ static void make_names(void) {
 #endif
 
 	if(!pidfilename) {
-		xasprintf(&pidfilename, LOCALSTATEDIR "/run/%s.pid", identname);
+		xasprintf(&pidfilename, RUNSTATEDIR "/%s.pid", identname);
 	}
 
 	if(!logfilename) {
@@ -658,8 +660,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 +676,8 @@ int main(int argc, char **argv) {
 		return 0;
 	}
 
+	make_names();
+
 	if(kill_tincd) {
 		return !kill_other(kill_tincd);
 	}
@@ -821,14 +823,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);