summaryrefslogtreecommitdiff
path: root/src/or
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2015-09-30 18:33:02 +0200
committerNick Mathewson <nickm@torproject.org>2015-09-30 18:34:15 +0200
commit71e4649f02940806c8be2b8349aeb2029f2721a0 (patch)
tree697c07e7ce40272166cc48c1a732acb0b2e7a94d /src/or
parent335af6fed8af30b8528965247622b71102e8dd2c (diff)
downloadtor-71e4649f02940806c8be2b8349aeb2029f2721a0.tar.gz
tor-71e4649f02940806c8be2b8349aeb2029f2721a0.zip
Disallow transitions on SyslogIdentityTag, since they do not work right
Diffstat (limited to 'src/or')
-rw-r--r--src/or/config.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/or/config.c b/src/or/config.c
index 9b65addeeb..f8fc757a2a 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -3997,6 +3997,12 @@ options_transition_allowed(const or_options_t *old,
return -1;
}
+ if (!opt_streq(old->SyslogIdentityTag, new_val->SyslogIdentityTag)) {
+ *msg = tor_strdup("While Tor is running, changing "
+ "SyslogIdentityTag is not allowed.");
+ return -1;
+ }
+
if ((old->HardwareAccel != new_val->HardwareAccel)
|| !opt_streq(old->AccelName, new_val->AccelName)
|| !opt_streq(old->AccelDir, new_val->AccelDir)) {