diff options
| author | Nick Mathewson <nickm@torproject.org> | 2017-10-20 10:27:05 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2017-10-20 11:39:17 -0400 |
| commit | c247a2df6b7f6b5d997ef9e5ccc25eaaf3918db8 (patch) | |
| tree | fc556e5c6d87d15369415aef2237649b1869bde4 /src/or/main.c | |
| parent | 9bafc3b1efd64b19695cd78fb51070ff8d3939f5 (diff) | |
| download | tor-c247a2df6b7f6b5d997ef9e5ccc25eaaf3918db8.tar.gz tor-c247a2df6b7f6b5d997ef9e5ccc25eaaf3918db8.zip | |
On locking failure, return -1 instead of exit()ing.
This is safe, since the only caller (options_act) will check the
return value, and propagate failure.
Diffstat (limited to 'src/or/main.c')
| -rw-r--r-- | src/or/main.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/or/main.c b/src/or/main.c index 4d252faf20..8bfea7895e 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -3265,7 +3265,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(1); // XXXX bad exit + return -1; } return r; } |