diff options
| author | Nick Mathewson <nickm@torproject.org> | 2020-05-06 16:47:03 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2020-05-06 16:47:03 -0400 |
| commit | fecc5fd38d80093a9c189eece4acd41c35cd36c6 (patch) | |
| tree | c741b52c2b172e0ff3eeb8f12bc4dd6bba02a396 /src/core | |
| parent | e61867416ec23b996de4c6a8c1c6875db549faf2 (diff) | |
| parent | d04b708b4bd47ee8df6796f19b25f558b2b18e91 (diff) | |
| download | tor-fecc5fd38d80093a9c189eece4acd41c35cd36c6.tar.gz tor-fecc5fd38d80093a9c189eece4acd41c35cd36c6.zip | |
Merge branch 'maint-0.4.2' into maint-0.4.3
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/proto/proto_socks.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/core/proto/proto_socks.c b/src/core/proto/proto_socks.c index 6fd08b2273..697fc683c5 100644 --- a/src/core/proto/proto_socks.c +++ b/src/core/proto/proto_socks.c @@ -1072,7 +1072,10 @@ parse_socks_client(const uint8_t *data, size_t datalen, log_info(LD_NET, "SOCKS 5 client: need authentication."); *drain_out = -1; return 2; - /* fall through */ + default: + /* This wasn't supposed to be exhaustive; there are other + * authentication methods too. */ + ; } *reason = tor_strdup("server doesn't support any of our available " |