fix argc checking
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@2181 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
@@ -352,8 +352,6 @@ main(int argc, char **argv)
|
|||||||
|
|
||||||
set_progname (argv[0]);
|
set_progname (argv[0]);
|
||||||
|
|
||||||
if (argc < 3)
|
|
||||||
usage ();
|
|
||||||
auth_method = AUTH_KRB5;
|
auth_method = AUTH_KRB5;
|
||||||
while ((c = getopt(argc, argv, "45l:nxp:")) != EOF) {
|
while ((c = getopt(argc, argv, "45l:nxp:")) != EOF) {
|
||||||
switch (c) {
|
switch (c) {
|
||||||
@@ -392,6 +390,11 @@ main(int argc, char **argv)
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
argc -= optind;
|
||||||
|
argv += optind;
|
||||||
|
|
||||||
|
if (argc < 1)
|
||||||
|
usage ();
|
||||||
|
|
||||||
if (port == 0)
|
if (port == 0)
|
||||||
if (do_encrypt && auth_method == AUTH_KRB4)
|
if (do_encrypt && auth_method == AUTH_KRB4)
|
||||||
@@ -399,6 +402,6 @@ main(int argc, char **argv)
|
|||||||
else
|
else
|
||||||
port = k_getportbyname ("kshell", "tcp", htons(544));
|
port = k_getportbyname ("kshell", "tcp", htons(544));
|
||||||
|
|
||||||
return doit (argv[optind], remote_user, port,
|
return doit (*argv, remote_user, port,
|
||||||
argc - optind - 1, argv + optind + 1);
|
argc - 1, argv + 1);
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user