tor

commit e6ceded7d8f241d08bc4e7eb8321b83e055e020a
parent d9d75d4ae148be91b0d6520c7addf4a1a484393a
Author: teor <teor@torproject.org>
Date:   Mon, 25 Nov 2019 12:24:22 +1000

Merge remote-tracking branch 'tor-github/pr/1557'

Diffstat:
M
src/app/config/config.c
 | 
4
++--

1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/app/config/config.c b/src/app/config/config.c
@@ -1945,7 +1945,7 @@ options_act_reversible,(const or_options_t *old_options, char **msg))
 
   if (first_time) {
     if (options_switch_id(msg) < 0)
-      goto done;
+      goto rollback;
   }
 
   /* On the other hand, we need to touch the file system _after_ we
@@ -1954,7 +1954,7 @@ options_act_reversible,(const or_options_t *old_options, char **msg))
    */
   if (first_time) {
     if (options_create_directories(msg) < 0)
-      goto done;
+      goto rollback;
   }
 
   /* Bail out at this point if we're not going to be a client or server: