summaryrefslogtreecommitdiff
path: root/apps/passwd.c
diff options
context:
space:
mode:
authorRich Salz <rsalz@akamai.com>2020-11-28 16:12:58 -0500
committerTomas Mraz <tmraz@fedoraproject.org>2020-12-15 11:47:17 +0100
commit021410ea3fc3876538830839d16b67e610d12785 (patch)
tree7178c87097f1083bc285a77f8ec179ceba343464 /apps/passwd.c
parentc678f68a19638c1e2bbfee6a7a1d8d728976ce66 (diff)
downloadopenssl-new-021410ea3fc3876538830839d16b67e610d12785.tar.gz
Check non-option arguments
Make sure all commands check to see if there are any "extra" arguments after the options, and print an error if so. Made all error messages consistent (which is to say, minimal). Fixes: #13527 Reviewed-by: Shane Lontis <shane.lontis@oracle.com> Reviewed-by: Tomas Mraz <tmraz@fedoraproject.org> (Merged from https://github.com/openssl/openssl/pull/13563)
Diffstat (limited to 'apps/passwd.c')
-rw-r--r--apps/passwd.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/apps/passwd.c b/apps/passwd.c
index 5bf031566a..c39254460d 100644
--- a/apps/passwd.c
+++ b/apps/passwd.c
@@ -184,9 +184,10 @@ int passwd_main(int argc, char **argv)
break;
}
}
+
+ /* All remaining arguments are the password text */
argc = opt_num_rest();
argv = opt_rest();
-
if (*argv != NULL) {
if (pw_source_defined)
goto opthelp;