Module Name: src
Committed By: christos
Date: Wed Feb 17 20:11:17 UTC 2016
Modified Files:
src/crypto/dist/ipsec-tools/src/racoon: cfparse.y
Log Message:
PR/50815: David Binderman: Remove dup test
To generate a diff of this commit:
cvs rdiff -u -r1.48 -r1.49 src/crypto/dist/ipsec-tools/src/racoon/cfparse.y
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/dist/ipsec-tools/src/racoon/cfparse.y
diff -u src/crypto/dist/ipsec-tools/src/racoon/cfparse.y:1.48 src/crypto/dist/ipsec-tools/src/racoon/cfparse.y:1.49
--- src/crypto/dist/ipsec-tools/src/racoon/cfparse.y:1.48 Thu Nov 29 10:31:24 2012
+++ src/crypto/dist/ipsec-tools/src/racoon/cfparse.y Wed Feb 17 15:11:17 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: cfparse.y,v 1.48 2012/11/29 15:31:24 vanhu Exp $ */
+/* $NetBSD: cfparse.y,v 1.49 2016/02/17 20:11:17 christos Exp $ */
/* Id: cfparse.y,v 1.66 2006/08/22 18:17:17 manubsd Exp */
@@ -1490,10 +1490,15 @@ sainfo_id
char portbuf[10];
struct sockaddr *saddr;
- if (($5 == IPPROTO_ICMP || $5 == IPPROTO_ICMPV6)
- && ($4 != IPSEC_PORT_ANY || $4 != IPSEC_PORT_ANY)) {
- yyerror("port number must be \"any\".");
+ switch ($5) {
+ case IPPROTO_ICMP:
+ case IPPROTO_ICMPV6:
+ if ($4 == IPSEC_PORT_ANY)
+ break;
+ yyerror("port must be \"any\" for icmp{,6}.");
return -1;
+ default:
+ break;
}
snprintf(portbuf, sizeof(portbuf), "%lu", $4);
