tor

commit c247a2df6b7f6b5d997ef9e5ccc25eaaf3918db8
parent 9bafc3b1efd64b19695cd78fb51070ff8d3939f5
Author: Nick Mathewson <nickm@torproject.org>
Date:   Fri, 20 Oct 2017 10:27:05 -0400

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:
M
src/or/main.c
 | 
2
+-

1 file changed, 1 insertion(+), 1 deletion(-)
diff --git 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;
       }