45 lines
1.4 KiB
Diff
45 lines
1.4 KiB
Diff
From 448f5a9257f76645bcff6881de3bb9a0f313c545 Mon Sep 17 00:00:00 2001
|
|
From: Vit Mojzis <vmojzis@redhat.com>
|
|
Date: Tue, 16 Oct 2018 12:05:31 +0200
|
|
Subject: [PATCH 073/170] python/sepolicy: Fix "info" to search aliases as well
|
|
|
|
Restore previous behaviour of "sepolicy.info()".
|
|
|
|
Signed-off-by: Vit Mojzis <vmojzis@redhat.com>
|
|
---
|
|
python/sepolicy/sepolicy/__init__.py | 12 +++++++++---
|
|
1 file changed, 9 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/selinux-python-2.8/sepolicy/sepolicy/__init__.py b/selinux-python-2.8/sepolicy/sepolicy/__init__.py
|
|
index 5d0535b9..d8c9decc 100644
|
|
--- a/selinux-python-2.8/sepolicy/sepolicy/__init__.py
|
|
+++ b/selinux-python-2.8/sepolicy/sepolicy/__init__.py
|
|
@@ -168,15 +168,21 @@ except ValueError as e:
|
|
def info(setype, name=None):
|
|
if setype == TYPE:
|
|
q = setools.TypeQuery(_pol)
|
|
- if name:
|
|
- q.name = name
|
|
+ q.name = name
|
|
+ results = list(q.results())
|
|
+
|
|
+ if name and len(results) < 1:
|
|
+ # type not found, try alias
|
|
+ q.name = None
|
|
+ q.alias = name
|
|
+ results = list(q.results())
|
|
|
|
return ({
|
|
'aliases': list(map(str, x.aliases())),
|
|
'name': str(x),
|
|
'permissive': bool(x.ispermissive),
|
|
'attributes': list(map(str, x.attributes()))
|
|
- } for x in q.results())
|
|
+ } for x in results)
|
|
|
|
elif setype == ROLE:
|
|
q = setools.RoleQuery(_pol)
|
|
--
|
|
2.19.1
|
|
|