diff options
| author | mmcc <> | 2015-12-10 18:31:52 +0000 |
|---|---|---|
| committer | mmcc <> | 2015-12-10 18:31:52 +0000 |
| commit | b921a8ce5bbd7e69fe11c090659e2d36c92c864c (patch) | |
| tree | 1ca74a601f9ef5911d6a3abc1621a2928ec080c1 | |
| parent | bf8c313f09d518464a5cb48da2ecb091ae7230c4 (diff) | |
| download | openbsd-b921a8ce5bbd7e69fe11c090659e2d36c92c864c.tar.gz openbsd-b921a8ce5bbd7e69fe11c090659e2d36c92c864c.tar.bz2 openbsd-b921a8ce5bbd7e69fe11c090659e2d36c92c864c.zip | |
Specify SOCKS version in error messages. ok deraadt@
| -rw-r--r-- | src/usr.bin/nc/socks.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/usr.bin/nc/socks.c b/src/usr.bin/nc/socks.c index 79b97bbffa..c63cf34939 100644 --- a/src/usr.bin/nc/socks.c +++ b/src/usr.bin/nc/socks.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: socks.c,v 1.22 2015/12/10 16:49:28 mmcc Exp $ */ | 1 | /* $OpenBSD: socks.c,v 1.23 2015/12/10 18:31:52 mmcc Exp $ */ |
| 2 | 2 | ||
| 3 | /* | 3 | /* |
| 4 | * Copyright (c) 1999 Niklas Hallqvist. All rights reserved. | 4 | * Copyright (c) 1999 Niklas Hallqvist. All rights reserved. |
| @@ -278,7 +278,7 @@ socks_connect(const char *host, const char *port, | |||
| 278 | if (cnt != 4) | 278 | if (cnt != 4) |
| 279 | err(1, "read failed (%zu/4)", cnt); | 279 | err(1, "read failed (%zu/4)", cnt); |
| 280 | if (buf[1] != 0) { | 280 | if (buf[1] != 0) { |
| 281 | errx(1, "connection failed, SOCKS error: %s", | 281 | errx(1, "connection failed, SOCKSv5 error: %s", |
| 282 | socks5_strerror(buf[1])); | 282 | socks5_strerror(buf[1])); |
| 283 | } | 283 | } |
| 284 | switch (buf[3]) { | 284 | switch (buf[3]) { |
| @@ -316,7 +316,7 @@ socks_connect(const char *host, const char *port, | |||
| 316 | if (cnt != 8) | 316 | if (cnt != 8) |
| 317 | err(1, "read failed (%zu/8)", cnt); | 317 | err(1, "read failed (%zu/8)", cnt); |
| 318 | if (buf[1] != 90) { | 318 | if (buf[1] != 90) { |
| 319 | errx(1, "connection failed, SOCKS error: %s", | 319 | errx(1, "connection failed, SOCKSv4 error: %s", |
| 320 | socks4_strerror(buf[1])); | 320 | socks4_strerror(buf[1])); |
| 321 | } | 321 | } |
| 322 | } else if (socksv == -1) { | 322 | } else if (socksv == -1) { |