diff options
| author | Ondrej Zajicek <santiago@crfreenet.org> | 2009-08-21 09:46:49 +0200 |
|---|---|---|
| committer | Ondrej Zajicek <santiago@crfreenet.org> | 2009-08-21 09:46:49 +0200 |
| commit | 2ef58837dcb7b78edc193bc9ef1da316bba86998 (patch) | |
| tree | ea2914b8a8159a98e11095432518c5fa74ea1197 | |
| parent | 86975e584eeabbc4f3111f2d100f05ca00579d31 (diff) | |
| parent | 5516a66d492497ba8776212defb3117ed1dbfbf8 (diff) | |
Merge commit 'origin/master' into dev
| -rw-r--r-- | doc/bird.sgml | 3 | ||||
| -rw-r--r-- | doc/prog-head.sgml | 3 | ||||
| -rw-r--r-- | nest/config.Y | 3 | ||||
| -rw-r--r-- | proto/ospf/config.Y | 3 | ||||
| -rw-r--r-- | proto/rip/config.Y | 2 |
5 files changed, 9 insertions, 5 deletions
diff --git a/doc/bird.sgml b/doc/bird.sgml index 267c768a..29fcd5a9 100644 --- a/doc/bird.sgml +++ b/doc/bird.sgml @@ -23,7 +23,8 @@ configuration primitives, <cf> is fragment of configuration within normal text, <author> Ondrej Filip <it/<feela@network.cz>/, Pavel Machek <it/<pavel@ucw.cz>/, -Martin Mares <it/<mj@ucw.cz>/ +Martin Mares <it/<mj@ucw.cz>/, +Ondrej Zajicek <it/<santiago@crfreenet.org>/ </author> <abstract> diff --git a/doc/prog-head.sgml b/doc/prog-head.sgml index 5e527e5f..0eec367e 100644 --- a/doc/prog-head.sgml +++ b/doc/prog-head.sgml @@ -13,7 +13,8 @@ <author> Ondrej Filip <it/<feela@network.cz>/, Pavel Machek <it/<pavel@ucw.cz>/, -Martin Mares <it/<mj@ucw.cz>/ +Martin Mares <it/<mj@ucw.cz>/, +Ondrej Zajicek <it/<santiago@crfreenet.org>/ </author> <abstract> diff --git a/nest/config.Y b/nest/config.Y index dc31224a..ad45a0d5 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]]) diff --git a/proto/ospf/config.Y b/proto/ospf/config.Y index 5fe8257a..9529f89a 100644 --- a/proto/ospf/config.Y +++ b/proto/ospf/config.Y @@ -38,8 +38,9 @@ CF_KEYWORDS(OSPF, AREA, OSPF_METRIC1, OSPF_METRIC2, OSPF_TAG, BROADCAST) CF_KEYWORDS(NEIGHBORS, RFC1583COMPAT, STUB, TICK, COST, RETRANSMIT) CF_KEYWORDS(HELLO, TRANSMIT, PRIORITY, DEAD, NONBROADCAST, POINTOPOINT, TYPE) CF_KEYWORDS(NONE, SIMPLE, AUTHENTICATION, STRICT, CRYPTOGRAPHIC) -CF_KEYWORDS(ELIGIBLE, POLL, NETWORKS, HIDDEN, VIRTUAL, LINK, PASSWORDS) +CF_KEYWORDS(ELIGIBLE, POLL, NETWORKS, HIDDEN, VIRTUAL, LINK) CF_KEYWORDS(RX, BUFFER, LARGE, NORMAL, STUBNET, HIDDEN, SUMMARY) +CF_KEYWORDS(WAIT, DELAY) %type <t> opttext diff --git a/proto/rip/config.Y b/proto/rip/config.Y index 9a11069e..2df0c5c8 100644 --- a/proto/rip/config.Y +++ b/proto/rip/config.Y @@ -24,7 +24,7 @@ CF_DEFINES CF_DECLS -CF_KEYWORDS(RIP, INFINITY, METRIC, PORT, PERIOD, GARBAGE, TIMEOUT, PASSWORDS, +CF_KEYWORDS(RIP, INFINITY, METRIC, PORT, PERIOD, GARBAGE, TIMEOUT, MODE, BROADCAST, MULTICAST, QUIET, NOLISTEN, VERSION1, AUTHENTICATION, NONE, PLAINTEXT, MD5, HONOR, NEVER, NEIGHBOR, ALWAYS, |