projects
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
APPS: Improve diagnostics on missing/extra args and unknown cipher/digest
[openssl.git]
/
apps
/
s_client.c
diff --git
a/apps/s_client.c
b/apps/s_client.c
index e0748496de3efaaa254e69ce68804f694dc1a206..b905fbd3ec93a207546246d7233703c7b568c1da 100644
(file)
--- a/
apps/s_client.c
+++ b/
apps/s_client.c
@@
-1473,8
+1473,7
@@
int s_client_main(int argc, char **argv)
}
/* Optional argument is connect string if -connect not used. */
}
/* Optional argument is connect string if -connect not used. */
- argc = opt_num_rest();
- if (argc == 1) {
+ if (opt_num_rest() == 1) {
/* Don't allow -connect and a separate argument. */
if (connectstr != NULL) {
BIO_printf(bio_err,
/* Don't allow -connect and a separate argument. */
if (connectstr != NULL) {
BIO_printf(bio_err,
@@
-1484,7
+1483,7
@@
int s_client_main(int argc, char **argv)
}
connect_type = use_inet;
freeandcopy(&connectstr, *opt_rest());
}
connect_type = use_inet;
freeandcopy(&connectstr, *opt_rest());
- } else if (
argc != 0
) {
+ } else if (
!opt_check_rest_arg(NULL)
) {
goto opthelp;
}
if (!app_RAND_load())
goto opthelp;
}
if (!app_RAND_load())