Patch for 22720 from huyvq: exit(1) more often

See changes file for full details.
This commit is contained in:
Nick Mathewson 2017-06-26 14:14:56 -04:00
parent 8f59661dba
commit d72cfb259d
3 changed files with 12 additions and 3 deletions

9
changes/bug22720 Normal file
View File

@ -0,0 +1,9 @@
o Minor bugfixes (process behavior):
- When exiting because of an error, always exit with a nonzero
exit status. Previously, we would fail to report an error in
our exit status in cases related to lockfile contention,
__OwningControllerProcess failure, and Ed25519 key
initialization. Fixes bug 22720; bugfix on versions
0.2.1.6-alpha, 0.2.2.28-beta, and 0.2.7.2-alpha
respectively. Reported by "f55jwk4f"; patch from "huyvq".

View File

@ -6506,7 +6506,7 @@ monitor_owning_controller_process(const char *process_spec)
msg);
owning_controller_process_spec = NULL;
tor_cleanup();
exit(0);
exit(1);
}
}

View File

@ -1556,7 +1556,7 @@ check_ed_keys_callback(time_t now, const or_options_t *options)
generate_ed_link_cert(options, now, new_signing_key > 0)) {
log_err(LD_OR, "Unable to update Ed25519 keys! Exiting.");
tor_cleanup();
exit(0);
exit(1);
}
}
return 30;
@ -3168,7 +3168,7 @@ try_locking(const or_options_t *options, int err_if_locked)
r = try_locking(options, 0);
if (r<0) {
log_err(LD_GENERAL, "No, it's still there. Exiting.");
exit(0);
exit(1);
}
return r;
}