RepoMirrors/setools
1
0
Fork 0
mirror of https://github.com/SELinuxProject/setools synced 2025-03-24 20:16:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

apol: revise match all vs. equal options

Browse Source 
Where subset is available, keep "match all" option since that is more
likely to be used.  Otherwise, change GUI to "Equal" for correctness.
This commit is contained in:
Chris PeBenito 2016-04-05 15:26:49 -04:00
parent f1a8077f79
commit 6502bae091
5 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
data/constraintquery.ui
View File

@ -657,7 +657,7 @@
</spacer>
</item>
<item row="0" column="3">
<widget class="QCheckBox" name="perms_equal">
<widget class="QCheckBox" name="perms_subset">
<property name="toolTip">
<string>A matching rule will have all of the selected permissions.</string>
</property>
@ -783,7 +783,7 @@
<tabstop>perms</tabstop>
<tabstop>clear_perms</tabstop>
<tabstop>invert_perms</tabstop>
<tabstop>perms_equal</tabstop>
<tabstop>perms_subset</tabstop>
<tabstop>results_frame</tabstop>
<tabstop>table_results</tabstop>
<tabstop>raw_results</tabstop>

4
data/objclassquery.ui
View File

@ -298,10 +298,10 @@
<item row="0" column="2">
<widget class="QCheckBox" name="perms_equal">
<property name="toolTip">
<string>A matching class will have all of the selected permissions.</string>
<string>A matching class will have a permission set equal to the selected permissions.</string>
</property>
<property name="text">
<string>Match All</string>
<string>Equal</string>
</property>
</widget>
</item>

12
data/terulequery.ui
View File

@ -844,10 +844,10 @@
<item row="0" column="3">
<widget class="QCheckBox" name="bools_equal">
<property name="toolTip">
<string>A matching rule will have all of the selected Booleans in its conditional expression..</string>
<string>A matching rule will use a set of Booleans in its conditional expression equal to the selected Booleans.</string>
</property>
<property name="text">
<string>Match All</string>
<string>Equal</string>
</property>
</widget>
</item>
@ -898,10 +898,10 @@
<item row="3" column="2">
<widget class="QCheckBox" name="xperms_equal">
<property name="toolTip">
<string>A matching rule will have all of the extended permissions.</string>
<string>A matching rule will have an extended permission set equal to the listed extended permissions.</string>
</property>
<property name="text">
<string>Match All</string>
<string>Equal</string>
</property>
</widget>
</item>
@ -933,7 +933,7 @@
</spacer>
</item>
<item row="0" column="3">
<widget class="QCheckBox" name="perms_equal">
<widget class="QCheckBox" name="perms_subset">
<property name="toolTip">
<string>A matching rule will have all of the selected permissions.</string>
</property>
@ -1022,7 +1022,7 @@
<tabstop>perms</tabstop>
<tabstop>clear_perms</tabstop>
<tabstop>invert_perms</tabstop>
<tabstop>perms_equal</tabstop>
<tabstop>perms_subset</tabstop>
<tabstop>default_type</tabstop>
<tabstop>default_regex</tabstop>
<tabstop>bool_criteria</tabstop>

2
setoolsgui/apol/constraintquery.py
View File

@ -270,7 +270,7 @@ class ConstraintQueryTab(SEToolsWidget, QScrollArea):
rule_types.append(mode.objectName())
self.query.ruletype = rule_types
self.query.perms_equal = self.perms_equal.isChecked()
self.query.perms_subset = self.perms_subset.isChecked()
# start processing
self.busy.setLabelText("Processing query...")

2
setoolsgui/apol/terulequery.py
View File

@ -372,7 +372,7 @@ class TERuleQueryTab(SEToolsWidget, QScrollArea):
self.query.ruletype = rule_types
self.query.source_indirect = self.source_indirect.isChecked()
self.query.target_indirect = self.target_indirect.isChecked()
self.query.perms_equal = self.perms_equal.isChecked()
self.query.perms_subset = self.perms_subset.isChecked()
self.query.boolean_equal = self.bools_equal.isChecked()
# if query is broad, show warning.