Merge branch 'fedora' into master-merge

This commit is contained in:
Stephen Smalley 2013-10-25 09:26:32 -04:00
commit 99b070d5fc
2 changed files with 3 additions and 2 deletions

View File

@ -667,8 +667,9 @@ def setupDontauditParser(subparsers):
def handleExport(args):
manageditems=[ "boolean", "login", "interface", "user", "port", "node", "fcontext", "module"]
for i in manageditems:
OBJECT = object_dict[i]()
print "%s -D" % i
for i in manageditems:
OBJECT = object_dict[i]()
for c in OBJECT.customized():
print "%s %s" % (i, str(c))

View File

@ -958,7 +958,7 @@ class seluserRecords(semanageRecords):
keys = ddict.keys()
keys.sort()
for k in keys:
l.append("-a -l %s -r %s -R '%s' %s" % (ddict[k][1], ddict[k][2], ddict[k][3], k))
l.append("-a -L %s -r %s -R '%s' %s" % (ddict[k][1], ddict[k][2], ddict[k][3], k))
return l
def list(self, heading = 1, locallist = 0):