summaryrefslogtreecommitdiffstats
path: root/proto
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 /proto
parent86975e584eeabbc4f3111f2d100f05ca00579d31 (diff)
parent5516a66d492497ba8776212defb3117ed1dbfbf8 (diff)
downloadbird-2ef58837dcb7b78edc193bc9ef1da316bba86998.tar
bird-2ef58837dcb7b78edc193bc9ef1da316bba86998.zip
Merge commit 'origin/master' into dev
Diffstat (limited to 'proto')
-rw-r--r--proto/ospf/config.Y3
-rw-r--r--proto/rip/config.Y2
2 files changed, 3 insertions, 2 deletions
diff --git a/proto/ospf/config.Y b/proto/ospf/config.Y
index 5fe8257..9529f89 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 9a11069..2df0c5c 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,