-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
This patch looks good to me. acked.
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/
iEYEARECAAYFAk7dHBsACgkQrlYvE4MpobPvcwCfbt418fRVA8n9+n/SZMy0RwP/
TZcAoNq7PcdLCGu+RCsZsw7BGYNAl5Tr
=TQX9
-----END PGP SIGNATURE-----
>From 98ad6a6d6a7d6b746d1fc94eae1d3d3903fffe29 Mon Sep 17 00:00:00 2001
From: Eric Paris <eparis@xxxxxxxxxx>
Date: Mon, 14 Nov 2011 10:16:18 -0500
Subject: [PATCH 24/48] checkpolicy: allow ~ in filename transition rules
We found that we wanted a filename transition rule for ld.so.cache~
however ~ was not a valid character in a filename.
Fix-from: Miroslav Grepl <mgrepl@xxxxxxxxxx>
Signed-off-by: Eric Paris <eparis@xxxxxxxxxx>
---
checkpolicy/policy_scan.l | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/checkpolicy/policy_scan.l b/checkpolicy/policy_scan.l
index 5ee27f8..9b24db5 100644
--- a/checkpolicy/policy_scan.l
+++ b/checkpolicy/policy_scan.l
@@ -222,7 +222,7 @@ POLICYCAP { return(POLICYCAP); }
permissive |
PERMISSIVE { return(PERMISSIVE); }
"/"({alnum}|[_\.\-/])* { return(PATH); }
-\"({alnum}|[_\.\-])+\" { return(FILENAME); }
+\"({alnum}|[_\.\-\~])+\" { return(FILENAME); }
{letter}({alnum}|[_\-])*([\.]?({alnum}|[_\-]))* { return(IDENTIFIER); }
{alnum}*{letter}{alnum}* { return(FILESYSTEM); }
{digit}+|0x{hexval}+ { return(NUMBER); }
--
1.7.7.4
