Merge branch 'obsd-master' into master

This commit is contained in:
Thomas Adam
2021-08-21 12:01:41 +01:00
64 changed files with 123 additions and 120 deletions

3
cmd.c
View File

@ -517,8 +517,7 @@ cmd_parse(int argc, char **argv, const char *file, u_int line, char **cause)
return (NULL);
cmd_log_argv(argc, argv, "%s: %s", __func__, entry->name);
args = args_parse(entry->args.template, argc, argv, entry->args.lower,
entry->args.upper);
args = args_parse(&entry->args, argc, argv);
if (args == NULL)
goto usage;