supported a declaration name (hostname, poolname, keyname, authname)

including "-".  (Bug-ID 1566476)

2 files changed, 5 insertions, 1 deletions

diff --git a/CHANGES b/CHANGES
index 0f1c140..f10bee8 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,7 @@
+2006-10-01  SUZUKI, Shinsuke <suz@kame.net>
+	* cftoken.l: supported a declaration name (hostname, poolname,
+	  keyname, authname) including "-".  (Bug-ID 1566476)
+
 2006-09-20  SUZUKI, Shinsuke <suz@kame.net>
 	* common.c: fixed a bug that dhcp6s inserts SIP server addresses into
 	  DNS server address option (Bug-ID 1561202).  (degrade from 2006-07-30)
diff --git a/cftoken.l b/cftoken.l
index 12487de..0bdbca2 100644
--- a/cftoken.l
+++ b/cftoken.l
@@ -96,7 +96,7 @@ comma		,
 comment		\#.*
 semi		\;
 quotedstring	\"[^\"]*\"
-string		[a-zA-Z0-9:\._][a-zA-Z0-9:\._]*
+string		[a-zA-Z0-9:\._\-][a-zA-Z0-9:\._\-]*
 digit		[0-9]
 integer 	{digit}+
 number		{integer}|({digit}*\.{integer})