From 23594ccda9d0813c1b019db7348d9e93f20bb884 Mon Sep 17 00:00:00 2001 From: Erik Skultety Date: Thu, 25 Jan 2018 16:13:37 +0100 Subject: [PATCH] vsh: Cmd aliases lookups should return results for the aliased command Unfortunately, we have a number of aliases in virsh and even though these are not visible any more, we have to support them. The problem is that when trying to print help for the alias, we get SIGSEGV because there isn't any @def structure anymore and we need to query the command being aliased instead. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1538570 Signed-off-by: Erik Skultety --- tools/vsh.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tools/vsh.c b/tools/vsh.c index 761d2ec3a4..37c292a03d 100644 --- a/tools/vsh.c +++ b/tools/vsh.c @@ -3194,6 +3194,8 @@ cmdHelp(vshControl *ctl, const vshCmd *cmd) } if ((def = vshCmddefSearch(name))) { + if (def->flags & VSH_CMD_FLAG_ALIAS) + def = vshCmddefSearch(def->alias); return vshCmddefHelp(ctl, def); } else if ((grp = vshCmdGrpSearch(name))) { return vshCmdGrpHelp(ctl, grp); -- 2.47.2