diff options
| author | deraadt <> | 2019-11-17 17:38:33 +0000 |
|---|---|---|
| committer | deraadt <> | 2019-11-17 17:38:33 +0000 |
| commit | 9bfb28ac67470fc0206f17c957aa89528235f373 (patch) | |
| tree | 754b6791910c4bfcc596789c41fbbaf0a805a367 /src/usr.bin | |
| parent | 516efe2f49b299dbcb3e0e96afba993c37476db8 (diff) | |
| download | openbsd-9bfb28ac67470fc0206f17c957aa89528235f373.tar.gz openbsd-9bfb28ac67470fc0206f17c957aa89528235f373.tar.bz2 openbsd-9bfb28ac67470fc0206f17c957aa89528235f373.zip | |
fail to usage if extra argv are present
noticed by jsing and beck, ok tedu
Diffstat (limited to 'src/usr.bin')
| -rw-r--r-- | src/usr.bin/nc/netcat.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/src/usr.bin/nc/netcat.c b/src/usr.bin/nc/netcat.c index 1dc95e9f36..051daf1811 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.211 2019/11/13 04:10:38 beck Exp $ */ | 1 | /* $OpenBSD: netcat.c,v 1.212 2019/11/17 17:38:33 deraadt 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. |
| @@ -352,15 +352,11 @@ main(int argc, char *argv[]) | |||
| 352 | err(1, "setrtable"); | 352 | err(1, "setrtable"); |
| 353 | 353 | ||
| 354 | /* Cruft to make sure options are clean, and used properly. */ | 354 | /* Cruft to make sure options are clean, and used properly. */ |
| 355 | if (argv[0] && !argv[1] && family == AF_UNIX) { | 355 | if (argc == 1 && family == AF_UNIX) { |
| 356 | host = argv[0]; | 356 | host = argv[0]; |
| 357 | uport = NULL; | 357 | } else if (argc == 1 && lflag) { |
| 358 | } else if (argv[0] && !argv[1]) { | ||
| 359 | if (!lflag) | ||
| 360 | usage(1); | ||
| 361 | uport = argv[0]; | 358 | uport = argv[0]; |
| 362 | host = NULL; | 359 | } else if (argc == 2) { |
| 363 | } else if (argv[0] && argv[1]) { | ||
| 364 | host = argv[0]; | 360 | host = argv[0]; |
| 365 | uport = argv[1]; | 361 | uport = argv[1]; |
| 366 | } else | 362 | } else |