Compare commits

...

1 Commits
master ... f19

Author SHA1 Message Date
Dan Walsh 96a76242de ":" should be allowed for file trans names 2013-03-19 19:43:19 -04:00
2 changed files with 6 additions and 3 deletions

View File

@ -1,5 +1,5 @@
diff --git a/checkpolicy/policy_scan.l b/checkpolicy/policy_scan.l
index bba7667..f82c93b 100644
index bba7667..ab046cc 100644
--- a/checkpolicy/policy_scan.l
+++ b/checkpolicy/policy_scan.l
@@ -240,7 +240,7 @@ HIGH { return(HIGH); }
@ -7,7 +7,7 @@ index bba7667..f82c93b 100644
LOW { return(LOW); }
"/"({alnum}|[_\.\-/])* { return(PATH); }
-\"({alnum}|[_\.\-\+\~])+\" { return(FILENAME); }
+\"({alnum}|[_\.\-\+\~ ])+\" { return(FILENAME); }
+\"({alnum}|[_\.\-\+\~\: ])+\" { return(FILENAME); }
{letter}({alnum}|[_\-])*([\.]?({alnum}|[_\-]))* { return(IDENTIFIER); }
{alnum}*{letter}{alnum}* { return(FILESYSTEM); }
{digit}+|0x{hexval}+ { return(NUMBER); }

View File

@ -3,7 +3,7 @@
Summary: SELinux policy compiler
Name: checkpolicy
Version: 2.1.12
Release: 2%{?dist}
Release: 3%{?dist}
License: GPLv2
Group: Development/System
Source: http://www.nsa.gov/selinux/archives/%{name}-%{version}.tgz
@ -56,6 +56,9 @@ rm -rf ${RPM_BUILD_ROOT}
%{_bindir}/sedispol
%changelog
* Tue Mar 19 2013 Dan Walsh <dwalsh@redhat.com> - 2.1.12-3
- ":" should be allowed for file trans names
* Tue Mar 12 2013 Dan Walsh <dwalsh@redhat.com> - 2.1.12-2
- Space should be allowed for file trans names