CVS commit: [netbsd-9] src/usr.sbin/npf/npfctl

[Martin Husemann]

Module Name:    src
Committed By:   martin
Date:           Mon May 25 17:29:28 UTC 2020

Modified Files:
        src/usr.sbin/npf/npfctl [netbsd-9]: npf_scan.l

Log Message:
Pull up following revision(s) (requested by rmind in ticket #932):

        usr.sbin/npf/npfctl/npf_scan.l: revision 1.31

PR/55288: npfctl: change parameter syntax to be more permissive.


To generate a diff of this commit:
cvs rdiff -u -r1.29.2.1 -r1.29.2.2 src/usr.sbin/npf/npfctl/npf_scan.l

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: src/usr.sbin/npf/npfctl/npf_scan.l
diff -u src/usr.sbin/npf/npfctl/npf_scan.l:1.29.2.1 src/usr.sbin/npf/npfctl/npf_scan.l:1.29.2.2
--- src/usr.sbin/npf/npfctl/npf_scan.l:1.29.2.1	Fri Oct  4 08:06:34 2019
+++ src/usr.sbin/npf/npfctl/npf_scan.l	Mon May 25 17:29:28 2020
@@ -91,6 +91,7 @@ npfctl_parse_string(const char *str, par
 
 ID	[a-zA-Z_][a-zA-Z_0-9]*
 DID	[a-zA-Z_][a-zA-Z_0-9-]*
+SPID	[a-zA-Z][a-zA-Z_0-9.]*
 NUMBER	[0-9]+
 HEXDIG	[0-9a-fA-F]+
 
@@ -227,7 +228,7 @@ any			return ANY;
 			return VAR_ID;
 		}
 
-[a-z]*"."[a-z.]* {
+{ID}"."{SPID}+	{
 			yylval.str = estrndup(yytext, yyleng);
 			return PARAM;
 		}