diff options
| -rw-r--r-- | changes/ticket40195 | 5 | ||||
| -rw-r--r-- | src/feature/relay/relay_config.c | 4 |
2 files changed, 9 insertions, 0 deletions
diff --git a/changes/ticket40195 b/changes/ticket40195 new file mode 100644 index 0000000000..caa0bace94 --- /dev/null +++ b/changes/ticket40195 @@ -0,0 +1,5 @@ + o Minor bugfixes (configuration, ports): + - Fix an issue where an ORPort was validated against other type of ports + when it should have been only checked against other ORPorts. This lead to + "DirPort auto" to be ignored and failing to be used. Fixes bug 40195; + bugfix on 0.4.5.1-alpha. diff --git a/src/feature/relay/relay_config.c b/src/feature/relay/relay_config.c index ea03f43e13..e8c29fa7ed 100644 --- a/src/feature/relay/relay_config.c +++ b/src/feature/relay/relay_config.c @@ -227,6 +227,10 @@ remove_duplicate_orports(smartlist_t *ports) if (removing[j]) { continue; } + /* Skip non ORPorts. */ + if (next->type != CONN_TYPE_OR_LISTENER) { + continue; + } /* Same address family and same port number, we have a match. */ if (tor_addr_family(¤t->addr) == tor_addr_family(&next->addr) && current->port == next->port) { |