aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2019-11-06 08:26:58 -0500
committerNick Mathewson <nickm@torproject.org>2019-11-06 08:37:32 -0500
commit1ee17dc07a4033546b5b4cfaedc3ace902ac8b20 (patch)
tree5bba76b56cb8fd654ce415733d90d23bbee1edc4
parent85e566a6a0541b141b694152ac99912d3a349dca (diff)
downloadtor-1ee17dc07a4033546b5b4cfaedc3ace902ac8b20.tar.gz
tor-1ee17dc07a4033546b5b4cfaedc3ace902ac8b20.zip
OwningControllerFD should be immutable, not OwningControllerProcess.
This is a mistake I made when marking options as immutable. Fixes bug 32399. Bug not in any released Tor.
-rw-r--r--src/app/config/config.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/app/config/config.c b/src/app/config/config.c
index 4a308a808f..e223011fcf 100644
--- a/src/app/config/config.c
+++ b/src/app/config/config.c
@@ -711,9 +711,9 @@ static const config_var_t option_vars_[] = {
VAR_NODUMP("__HashedControlSessionPassword", LINELIST,
HashedControlSessionPassword,
NULL),
- VAR_NODUMP_IMMUTABLE("__OwningControllerProcess",STRING,
+ VAR_NODUMP("__OwningControllerProcess",STRING,
OwningControllerProcess, NULL),
- VAR_NODUMP("__OwningControllerFD", UINT64, OwningControllerFD,
+ VAR_NODUMP_IMMUTABLE("__OwningControllerFD", UINT64, OwningControllerFD,
UINT64_MAX_STRING),
V(MinUptimeHidServDirectoryV2, INTERVAL, "96 hours"),
V(TestingServerDownloadInitialDelay, CSV_INTERVAL, "0"),