summaryrefslogtreecommitdiff
path: root/src/or/main.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2017-10-20 11:03:53 -0400
committerNick Mathewson <nickm@torproject.org>2017-10-20 11:39:17 -0400
commit853e73e815c1be9c9e533160f803de56e7d21147 (patch)
tree2f5a758e15dcad2cbb6f3df4ed8be659989a6569 /src/or/main.c
parentc247a2df6b7f6b5d997ef9e5ccc25eaaf3918db8 (diff)
downloadtor-853e73e815c1be9c9e533160f803de56e7d21147.tar.gz
tor-853e73e815c1be9c9e533160f803de56e7d21147.zip
Return from instead of exit()ing when ed25519 key check fails.
Diffstat (limited to 'src/or/main.c')
-rw-r--r--src/or/main.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/or/main.c b/src/or/main.c
index 8bfea7895e..d47c8f4dd3 100644
--- a/src/or/main.c
+++ b/src/or/main.c
@@ -1609,8 +1609,7 @@ check_ed_keys_callback(time_t now, const or_options_t *options)
if (new_signing_key < 0 ||
generate_ed_link_cert(options, now, new_signing_key > 0)) {
log_err(LD_OR, "Unable to update Ed25519 keys! Exiting.");
- tor_cleanup();
- exit(1); // XXXX bad exit
+ tor_shutdown_event_loop_and_exit(1);
}
}
return 30;