From 0bf95f99e6126b481a4dcac574ada59f9ad3662b Mon Sep 17 00:00:00 2001
From: "Ondrej Zajicek (work)" <santiago@crfreenet.org>
Date: Mon, 21 Dec 2015 17:17:21 +0100
Subject: Follow-up work on integration

Contains some patches from Jan Moskyto Matejka
---
 nest/config.Y | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'nest/config.Y')

diff --git a/nest/config.Y b/nest/config.Y
index de75509f..9d20dd48 100644
--- a/nest/config.Y
+++ b/nest/config.Y
@@ -55,7 +55,7 @@ CF_DECLS
 
 CF_KEYWORDS(ROUTER, ID, PROTOCOL, TEMPLATE, PREFERENCE, DISABLED, DEBUG, ALL, OFF, DIRECT)
 CF_KEYWORDS(INTERFACE, IMPORT, EXPORT, FILTER, NONE, TABLE, STATES, ROUTES, FILTERS)
-CF_KEYWORDS(IPV4, IPVX, VPN4, VPN6)
+CF_KEYWORDS(IPV4, IPV6, VPN4, VPN6)
 CF_KEYWORDS(RECEIVE, LIMIT, ACTION, WARN, BLOCK, RESTART, DISABLE, KEEP, FILTERED)
 CF_KEYWORDS(PASSWORD, FROM, PASSIVE, TO, ID, EVENTS, PACKETS, PROTOCOLS, INTERFACES)
 CF_KEYWORDS(PRIMARY, STATS, COUNT, FOR, COMMANDS, PREEXPORT, NOEXPORT, GENERATE) /* ,ROA */
@@ -134,7 +134,7 @@ CF_ADDTO(conf, table)
 table_type:
    /* empty */ { $$ = NET_IP4; }
  | IPV4 { $$ = NET_IP4; }
- | IPVX { $$ = NET_IP6; } /* XXXX */
+ | IPV6 { $$ = NET_IP6; }
  | VPN4 { $$ = NET_VPN4; }
  | VPN6 { $$ = NET_VPN6; }
  ;
-- 
cgit v1.2.3