summaryrefslogtreecommitdiffstats
path: root/nest
diff options
context:
space:
mode:
authorOndrej Zajicek <santiago@crfreenet.org>2009-08-21 09:46:49 +0200
committerOndrej Zajicek <santiago@crfreenet.org>2009-08-21 09:46:49 +0200
commit2ef58837dcb7b78edc193bc9ef1da316bba86998 (patch)
treeea2914b8a8159a98e11095432518c5fa74ea1197 /nest
parent86975e584eeabbc4f3111f2d100f05ca00579d31 (diff)
parent5516a66d492497ba8776212defb3117ed1dbfbf8 (diff)
downloadbird-2ef58837dcb7b78edc193bc9ef1da316bba86998.tar
bird-2ef58837dcb7b78edc193bc9ef1da316bba86998.zip
Merge commit 'origin/master' into dev
Diffstat (limited to 'nest')
-rw-r--r--nest/config.Y3
1 files changed, 2 insertions, 1 deletions
diff --git a/nest/config.Y b/nest/config.Y
index dc31224..ad45a0d 100644
--- a/nest/config.Y
+++ b/nest/config.Y
@@ -44,7 +44,7 @@ CF_KEYWORDS(ROUTER, ID, PROTOCOL, PREFERENCE, DISABLED, DEBUG, ALL, OFF, DIRECT)
CF_KEYWORDS(INTERFACE, IMPORT, EXPORT, FILTER, NONE, TABLE, STATES, ROUTES, FILTERS)
CF_KEYWORDS(PASSWORD, FROM, PASSIVE, TO, ID, EVENTS, PACKETS, PROTOCOLS, INTERFACES)
CF_KEYWORDS(PRIMARY, STATS, COUNT, FOR, COMMANDS, PREEXPORT, GENERATE)
-CF_KEYWORDS(LISTEN, BGP, V6ONLY, ADDRESS, PORT)
+CF_KEYWORDS(LISTEN, BGP, V6ONLY, ADDRESS, PORT, PASSWORDS)
CF_ENUM(T_ENUM_RTS, RTS_, DUMMY, STATIC, INHERIT, DEVICE, STATIC_DEVICE, REDIRECT,
RIP, OSPF, OSPF_IA, OSPF_EXT1, OSPF_EXT2, BGP, PIPE)
@@ -293,6 +293,7 @@ password_item_params:
;
+
/* Core commands */
CF_CLI_HELP(SHOW, ..., [[Show status information]])