aboutsummaryrefslogtreecommitdiff
path: root/src/app
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2018-07-12 08:59:23 -0400
committerNick Mathewson <nickm@torproject.org>2018-07-12 08:59:23 -0400
commita7ec493d88bfdd2735ee50893dfa890e60900e2b (patch)
tree13ef463f8285f11f2d63e2a0b2a2dcaf96e56545 /src/app
parent66074ad1e21cfe6c98a70b279ed690e357d1c41c (diff)
parentabeb07a1bff4f68a3143bb47a6123c0fef83ff79 (diff)
downloadtor-a7ec493d88bfdd2735ee50893dfa890e60900e2b.tar.gz
tor-a7ec493d88bfdd2735ee50893dfa890e60900e2b.zip
Merge remote-tracking branch 'imnotbad/bug26663'
Diffstat (limited to 'src/app')
-rw-r--r--src/app/config/config.c2
-rw-r--r--src/app/config/confparse.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/app/config/config.c b/src/app/config/config.c
index 74aa64dede..1f4f099be7 100644
--- a/src/app/config/config.c
+++ b/src/app/config/config.c
@@ -7001,7 +7001,7 @@ parse_port_config(smartlist_t *out,
port = 0;
else
port = 1;
- } else if (!strcmp(addrport, "auto")) {
+ } else if (!strcasecmp(addrport, "auto")) {
port = CFG_AUTO_PORT;
int af = tor_addr_parse(&addr, defaultaddr);
tor_assert(af >= 0);
diff --git a/src/app/config/confparse.c b/src/app/config/confparse.c
index 5b7f54bc65..6fa4fd1ea8 100644
--- a/src/app/config/confparse.c
+++ b/src/app/config/confparse.c
@@ -267,7 +267,7 @@ config_assign_value(const config_format_t *fmt, void *options,
break;
case CONFIG_TYPE_AUTOBOOL:
- if (!strcmp(c->value, "auto"))
+ if (!strcasecmp(c->value, "auto"))
*(int *)lvalue = -1;
else if (!strcmp(c->value, "0"))
*(int *)lvalue = 0;