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 | d04b708b4bd47ee8df6796f19b25f558b2b18e91 (patch) | |
| tree | 3eb744174d8e923fed56b4714244b94ed70c94b9 /src/core/proto | |
| parent | bbfc498e21c9854b16b0543bf3f3f4ac304711f7 (diff) | |
| parent | 28f453c4764962394bf0cd3a314b2b60af7ee1b4 (diff) | |
| download | tor-d04b708b4bd47ee8df6796f19b25f558b2b18e91.tar.gz tor-d04b708b4bd47ee8df6796f19b25f558b2b18e91.zip | |
Merge branch 'maint-0.4.1' into maint-0.4.2
Diffstat (limited to 'src/core/proto')
| -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 b657a7b758..f9f8c8afc0 100644 --- a/src/core/proto/proto_socks.c +++ b/src/core/proto/proto_socks.c @@ -1067,7 +1067,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 " |