commit a7557fe0f59873f0d50553e2dec5f2903ddaeca6
author Neels Hofmeyr <neels@hofmeyr.de> Mon Sep 24 04:16:42 2018 +0200
committer Harald Welte <laforge@gnumonks.org> Mon Sep 24 06:40:04 2018 +0000
tree 1dba9360cd57356e9ab2e2718643ceb6653a0df8
parent cf8def25d59f4453620e109c9f7f033d01fe4583

vty list: fix deprecation/hidden bit logic

If a command is both hidden and deprecated, still don't show it for the 'list'
command.

We currently have no such nodes, as it seems, though.

Related: OS#3584
Change-Id: I07ec15cab057a3e09064e0420a69121ee8eb4253

src/vty/command.c

diff --git a/src/vty/command.c b/src/vty/command.c
index 900680f..1e77d13 100644
--- a/src/vty/command.c
+++ b/src/vty/command.c
@@ -2728,8 +2728,7 @@
 
 	for (i = 0; i < vector_active(cnode->cmd_vector); i++)
 		if ((cmd = vector_slot(cnode->cmd_vector, i)) != NULL
-		    && !(cmd->attr == CMD_ATTR_DEPRECATED
-			 || cmd->attr == CMD_ATTR_HIDDEN))
+		    && !(cmd->attr & (CMD_ATTR_DEPRECATED | CMD_ATTR_HIDDEN)))
 			vty_out(vty, "  %s%s", cmd->string, VTY_NEWLINE);
 	return CMD_SUCCESS;
 }