RepoMirrors
/
selinux-refpolicy
mirror of https://github.com/SELinuxProject/refpolicy
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of git://github.com/aduskett/refpolicy

This commit is contained in:
Chris PeBenito 2017-10-11 18:50:58 -04:00
parent 3001c50364 6c9cc47e6c
commit a89570282e
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
support/genhomedircon.py
View File

@ -189,13 +189,13 @@ def oldgenhomedircon(filecontextdir, filecontext):
addme = 1 addme = 1
for regex in prefix_regex: for regex in prefix_regex:
#match a trailing (/*)? which is actually a bug in rpc_pipefs #match a trailing (/*)? which is actually a bug in rpc_pipefs
regex = re.sub("\(/\*\)\?$", "", regex) regex = re.sub(r"\(/\*\)\?$", "", regex)
#match a trailing .+ #match a trailing .+
regex = re.sub("\.+$", "", regex) regex = re.sub(r"\.+$", "", regex)
#match a trailing .* #match a trailing .*
regex = re.sub("\.\*$", "", regex) regex = re.sub(r"\.\*$", "", regex)
#strip a (/.*)? which matches anything trailing to a /*$ which matches trailing /'s #strip a (/.*)? which matches anything trailing to a /*$ which matches trailing /'s
regex = re.sub("\(\/\.\*\)\?", "", regex) regex = re.sub(r"\(\/\.\*\)\?", "", regex)
regex = regex + "/*$" regex = regex + "/*$"
if re.search(regex, potential, 0): if re.search(regex, potential, 0):
addme = 0 addme = 0
@ -391,13 +391,13 @@ class selinuxConfig:
exists=1 exists=1
for regex in prefix_regex: for regex in prefix_regex:
#match a trailing (/*)? which is actually a bug in rpc_pipefs #match a trailing (/*)? which is actually a bug in rpc_pipefs
regex = re.sub("\(/\*\)\?$", "", regex) regex = re.sub(r"\(/\*\)\?$", "", regex)
#match a trailing .+ #match a trailing .+
regex = re.sub("\.+$", "", regex) regex = re.sub(r"\.+$", "", regex)
#match a trailing .* #match a trailing .*
regex = re.sub("\.\*$", "", regex) regex = re.sub(r"\.\*$", "", regex)
#strip a (/.*)? which matches anything trailing to a /*$ which matches trailing /'s #strip a (/.*)? which matches anything trailing to a /*$ which matches trailing /'s
regex = re.sub("\(\/\.\*\)\?", "", regex) regex = re.sub(r"\(\/\.\*\)\?", "", regex)
regex = regex + "/*$" regex = regex + "/*$"
if re.search(regex, home, 0): if re.search(regex, home, 0):
exists = 0 exists = 0