From 1ba19fe8ce3337974c580a66887d0c4265eb2bfb Mon Sep 17 00:00:00 2001 From: Bruce M Simpson Date: Wed, 31 Mar 2004 18:38:02 +0000 Subject: [PATCH] Fix regression in setkey whereby parser would fail to recognise tcp as both a security protocol and an upper level protocol for encapsulation. PR: bin/63616 Submitted by: ume@ --- sbin/setkey/parse.y | 1 + usr.sbin/setkey/parse.y | 1 + 2 files changed, 2 insertions(+) diff --git a/sbin/setkey/parse.y b/sbin/setkey/parse.y index bc944a821098..0693a9642142 100644 --- a/sbin/setkey/parse.y +++ b/sbin/setkey/parse.y @@ -672,6 +672,7 @@ portstr upper_spec : DECSTRING { $$ = $1; } | ANY { $$ = IPSEC_ULPROTO_ANY; } + | PR_TCP { $$ = IPPROTO_TCP; } | STRING { struct protoent *ent; diff --git a/usr.sbin/setkey/parse.y b/usr.sbin/setkey/parse.y index bc944a821098..0693a9642142 100644 --- a/usr.sbin/setkey/parse.y +++ b/usr.sbin/setkey/parse.y @@ -672,6 +672,7 @@ portstr upper_spec : DECSTRING { $$ = $1; } | ANY { $$ = IPSEC_ULPROTO_ANY; } + | PR_TCP { $$ = IPPROTO_TCP; } | STRING { struct protoent *ent;