diff options
author | Nick Mathewson <nickm@torproject.org> | 2013-03-20 16:17:06 -0400 |
---|---|---|
committer | Nick Mathewson <nickm@torproject.org> | 2013-03-20 16:17:06 -0400 |
commit | fa3c23773944788125db2f67bcb048376c17fec9 (patch) | |
tree | 93d89b2871e52c95ba5a9e5ae25817d44b0232ee /src/or/connection.c | |
parent | a264c4fedab87ce7c8cbb94632657a90e95e7a4e (diff) | |
download | tor-fa3c23773944788125db2f67bcb048376c17fec9.tar.gz tor-fa3c23773944788125db2f67bcb048376c17fec9.zip |
Per-SOCKSPort configuration for bug 8117 fix.
This might be necessary if the bug8117 fix confuses any applications.
Also add a changes file.
Diffstat (limited to 'src/or/connection.c')
-rw-r--r-- | src/or/connection.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/or/connection.c b/src/or/connection.c index eac9c4f32b..aeb4949e0a 100644 --- a/src/or/connection.c +++ b/src/or/connection.c @@ -1056,6 +1056,7 @@ connection_listener_new(const struct sockaddr *listensockaddr, lis_conn->session_group = global_next_session_group--; } } + lis_conn->socks_prefer_no_auth = port_cfg->socks_prefer_no_auth; if (connection_add(conn) < 0) { /* no space, forget it */ log_warn(LD_NET,"connection_add for listener failed. Giving up."); @@ -1238,6 +1239,11 @@ connection_handle_listener_read(connection_t *conn, int new_type) newconn->port = port; newconn->address = tor_dup_addr(&addr); + if (new_type == CONN_TYPE_AP) { + TO_ENTRY_CONN(newconn)->socks_request->socks_prefer_no_auth = + TO_LISTENER_CONN(conn)->socks_prefer_no_auth; + } + } else if (conn->socket_family == AF_UNIX) { /* For now only control ports can be Unix domain sockets * and listeners at the same time */ |