Stop discarding command-line arguments when TestingTorNetwork is set

Discovered by Kevin Bauer. Fixes bug 5373; bugfix on 0.2.3.9-alpha,
where task 4552 added support for two layers of torrc files.

diff --git a/changes/bug5373 b/changes/bug5373
new file mode 100644 (file)
index 0000000..0e1ebe8
--- /dev/null
+++ b/changes/bug5373
@@ -0,0 +1,5 @@
+  o Major bugfixes:
+    - Stop discarding command-line arguments when TestingTorNetwork
+      is set. Discovered by Kevin Bauer. Fixes bug 5373; bugfix on
+      0.2.3.9-alpha, where task 4552 added support for two layers of
+      torrc files.

diff --git a/src/or/config.c b/src/or/config.c
index 3a7bf65e371ae48584937ce69586b9d22c5e0dc1..0c699b021d256543b7881e77e46494d80f3fb626 100644 (file)
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -4660,6 +4660,13 @@ options_init_from_string(const char *cf_defaults, const char *cf,
       if (i==0)
         newdefaultoptions = options_dup(&options_format, newoptions);
     }
+    /* Assign command-line variables a second time too */
+    retval = config_assign(&options_format, newoptions,
+                           global_cmdline_options, 0, 0, msg);
+    if (retval < 0) {
+      err = SETOPT_ERR_PARSE;
+      goto err;
+    }
   }
 
   /* Validate newoptions */