[src/netbsd-9]: src/usr.sbin/npf/npfctl Pull up following revision(s) (reques...

[martin <martin%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/5ea9abd22493
branches:  netbsd-9
changeset: 963914:5ea9abd22493
user:      martin <martin%NetBSD.org@localhost>
date:      Mon May 25 17:29:28 2020 +0000

description:
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.

diffstat:

 usr.sbin/npf/npfctl/npf_scan.l |  3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diffs (20 lines):

diff -r 04aa1038914f -r 5ea9abd22493 usr.sbin/npf/npfctl/npf_scan.l
--- a/usr.sbin/npf/npfctl/npf_scan.l    Mon May 25 17:27:19 2020 +0000
+++ b/usr.sbin/npf/npfctl/npf_scan.l    Mon May 25 17:29:28 2020 +0000
@@ -91,6 +91,7 @@
 
 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 @@
                        return VAR_ID;
                }
 
-[a-z]*"."[a-z.]* {
+{ID}"."{SPID}+ {
                        yylval.str = estrndup(yytext, yyleng);
                        return PARAM;
                }