diff options
| author | jmc <> | 2017-04-05 06:55:59 +0000 |
|---|---|---|
| committer | jmc <> | 2017-04-05 06:55:59 +0000 |
| commit | 0403ae7d00b85a4ed9aac3dee7804185706a1c17 (patch) | |
| tree | e7b3fa74db57640dacd12d844d462ed7d6176fd9 /src | |
| parent | 83f309bbf0134f1cf9d001a778a3ddd8c0556bc2 (diff) | |
| download | openbsd-0403ae7d00b85a4ed9aac3dee7804185706a1c17.tar.gz openbsd-0403ae7d00b85a4ed9aac3dee7804185706a1c17.tar.bz2 openbsd-0403ae7d00b85a4ed9aac3dee7804185706a1c17.zip | |
- -Z before -z in options list
- add -Z to help and usage()
Diffstat (limited to 'src')
| -rw-r--r-- | src/usr.bin/nc/nc.1 | 10 | ||||
| -rw-r--r-- | src/usr.bin/nc/netcat.c | 6 |
2 files changed, 9 insertions, 7 deletions
diff --git a/src/usr.bin/nc/nc.1 b/src/usr.bin/nc/nc.1 index 0f1263da7c..1b753e3d80 100644 --- a/src/usr.bin/nc/nc.1 +++ b/src/usr.bin/nc/nc.1 | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | .\" $OpenBSD: nc.1,v 1.83 2017/04/05 03:20:19 beck Exp $ | 1 | .\" $OpenBSD: nc.1,v 1.84 2017/04/05 06:55:59 jmc Exp $ |
| 2 | .\" | 2 | .\" |
| 3 | .\" Copyright (c) 1996 David Sacerdote | 3 | .\" Copyright (c) 1996 David Sacerdote |
| 4 | .\" All rights reserved. | 4 | .\" All rights reserved. |
| @@ -331,6 +331,10 @@ for SOCKS, 3128 for HTTPS). | |||
| 331 | An IPv6 address can be specified unambiguously by enclosing | 331 | An IPv6 address can be specified unambiguously by enclosing |
| 332 | .Ar proxy_address | 332 | .Ar proxy_address |
| 333 | in square brackets. | 333 | in square brackets. |
| 334 | .It Fl Z Ar peercertfile | ||
| 335 | Specifies the filename in which the peer supplied certificates will be saved | ||
| 336 | in PEM format. | ||
| 337 | May only be used with TLS. | ||
| 334 | .It Fl z | 338 | .It Fl z |
| 335 | Specifies that | 339 | Specifies that |
| 336 | .Nm | 340 | .Nm |
| @@ -338,10 +342,6 @@ should just scan for listening daemons, without sending any data to them. | |||
| 338 | It is an error to use this option in conjunction with the | 342 | It is an error to use this option in conjunction with the |
| 339 | .Fl l | 343 | .Fl l |
| 340 | option. | 344 | option. |
| 341 | .It Fl Z Ar peercertfile | ||
| 342 | Specifies the filename in which the peer supplied certificates will be saved | ||
| 343 | in PEM format. | ||
| 344 | May only be used with TLS. | ||
| 345 | .El | 345 | .El |
| 346 | .Pp | 346 | .Pp |
| 347 | .Ar destination | 347 | .Ar destination |
diff --git a/src/usr.bin/nc/netcat.c b/src/usr.bin/nc/netcat.c index 74074aa938..4d81709bd0 100644 --- a/src/usr.bin/nc/netcat.c +++ b/src/usr.bin/nc/netcat.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: netcat.c,v 1.179 2017/04/05 03:20:19 beck Exp $ */ | 1 | /* $OpenBSD: netcat.c,v 1.180 2017/04/05 06:55:59 jmc Exp $ */ |
| 2 | /* | 2 | /* |
| 3 | * Copyright (c) 2001 Eric Jackson <ericj@monkey.org> | 3 | * Copyright (c) 2001 Eric Jackson <ericj@monkey.org> |
| 4 | * Copyright (c) 2015 Bob Beck. All rights reserved. | 4 | * Copyright (c) 2015 Bob Beck. All rights reserved. |
| @@ -1708,6 +1708,7 @@ help(void) | |||
| 1708 | \t-w timeout Timeout for connects and final net reads\n\ | 1708 | \t-w timeout Timeout for connects and final net reads\n\ |
| 1709 | \t-X proto Proxy protocol: \"4\", \"5\" (SOCKS) or \"connect\"\n\ | 1709 | \t-X proto Proxy protocol: \"4\", \"5\" (SOCKS) or \"connect\"\n\ |
| 1710 | \t-x addr[:port]\tSpecify proxy address and port\n\ | 1710 | \t-x addr[:port]\tSpecify proxy address and port\n\ |
| 1711 | \t-Z Peer certificate file\n\ | ||
| 1711 | \t-z Zero-I/O mode [used for scanning]\n\ | 1712 | \t-z Zero-I/O mode [used for scanning]\n\ |
| 1712 | Port numbers can be individual or ranges: lo-hi [inclusive]\n"); | 1713 | Port numbers can be individual or ranges: lo-hi [inclusive]\n"); |
| 1713 | exit(1); | 1714 | exit(1); |
| @@ -1724,7 +1725,8 @@ usage(int ret) | |||
| 1724 | "[-R CAfile]\n" | 1725 | "[-R CAfile]\n" |
| 1725 | "\t [-s source] [-T keyword] [-V rtable] [-w timeout] " | 1726 | "\t [-s source] [-T keyword] [-V rtable] [-w timeout] " |
| 1726 | "[-X proxy_protocol]\n" | 1727 | "[-X proxy_protocol]\n" |
| 1727 | "\t [-x proxy_address[:port]] [destination] [port]\n"); | 1728 | "\t [-x proxy_address[:port]] [-Z peercertfile] " |
| 1729 | "[destination] [port]\n"); | ||
| 1728 | if (ret) | 1730 | if (ret) |
| 1729 | exit(1); | 1731 | exit(1); |
| 1730 | } | 1732 | } |