From: claudio <claudio@openbsd.org>
Date: Fri, 21 Sep 2018 08:17:15 +0000 (+0000)
Subject: Both AS 23456 and AS 0 are reserved and can nor be used. Extend check for
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=366776a7e00d99e58b94e868c9e45646a6748074;p=openbsd

Both AS 23456 and AS 0 are reserved and can nor be used. Extend check for
AS 0 and adjust yyerror message to print the right number.
With input and OK denis@
---

diff --git a/usr.sbin/bgpd/parse.y b/usr.sbin/bgpd/parse.y
index 66d5a3a4a94..d50657655c5 100644
--- a/usr.sbin/bgpd/parse.y
+++ b/usr.sbin/bgpd/parse.y
@@ -1,4 +1,4 @@
-/*	$OpenBSD: parse.y,v 1.358 2018/09/21 08:15:33 claudio Exp $ */
+/*	$OpenBSD: parse.y,v 1.359 2018/09/21 08:17:15 claudio Exp $ */
 
 /*
  * Copyright (c) 2002, 2003, 2004 Henning Brauer <henning@openbsd.org>
@@ -297,17 +297,17 @@ as4number	: STRING			{
 				free($1);
 				YYERROR;
 			}
-			if (uvalh == 0 && uval == AS_TRANS) {
+			if (uvalh == 0 && (uval == AS_TRANS || uval == 0)) {
 				yyerror("AS %u is reserved and may not be used",
-				    AS_TRANS);
+				    uval);
 				YYERROR;
 			}
 			$$ = uval | (uvalh << 16);
 		}
 		| asnumber {
-			if ($1 == AS_TRANS) {
+			if ($1 == AS_TRANS || $1 == 0) {
 				yyerror("AS %u is reserved and may not be used",
-				    AS_TRANS);
+				    (u_int32_t)$1);
 				YYERROR;
 			}
 			$$ = $1;