| Message ID | 20190207091844.11336-1-plautrba@redhat.com (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [v2] dbus: Fix name of polkit function | expand |
On Thu, Feb 7, 2019 at 10:18 AM Petr Lautrbach <plautrba@redhat.com> wrote: > > From: Dan Walsh <dwalsh@redhat.com> > > Add missing action org.selinux.change_default_mode for change_default_mode() and > remove unused action org.selinux.change_policy_type. > > Fixes: e8718ef51463 ("Make sure we do the polkit check on all dbus interfaces.") > > Signed-off-by: Petr Lautrbach <plautrba@redhat.com> Acked-by: Nicolas Iooss <nicolas.iooss@m4x.org> > --- > dbus/org.selinux.policy | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/dbus/org.selinux.policy b/dbus/org.selinux.policy > index 01266102..9772127b 100644 > --- a/dbus/org.selinux.policy > +++ b/dbus/org.selinux.policy > @@ -70,9 +70,9 @@ > <allow_active>auth_admin_keep</allow_active> > </defaults> > </action> > - <action id="org.selinux.change_policy_type"> > - <description>SELinux write access</description> > - <message>System policy prevents change_policy_type access to SELinux</message> > + <action id="org.selinux.change_default_mode"> > + <description>Change SELinux default enforcing mode</description> > + <message>System policy prevents change_default_policy access to SELinux</message> > <defaults> > <allow_any>no</allow_any> > <allow_inactive>no</allow_inactive> > -- > 2.20.1 >
On Thu, Feb 7, 2019 at 10:04 PM Nicolas Iooss <nicolas.iooss@m4x.org> wrote: > > On Thu, Feb 7, 2019 at 10:18 AM Petr Lautrbach <plautrba@redhat.com> wrote: > > > > From: Dan Walsh <dwalsh@redhat.com> > > > > Add missing action org.selinux.change_default_mode for change_default_mode() and > > remove unused action org.selinux.change_policy_type. > > > > Fixes: e8718ef51463 ("Make sure we do the polkit check on all dbus interfaces.") > > > > Signed-off-by: Petr Lautrbach <plautrba@redhat.com> > > Acked-by: Nicolas Iooss <nicolas.iooss@m4x.org> Merged. Nicolas > > --- > > dbus/org.selinux.policy | 6 +++--- > > 1 file changed, 3 insertions(+), 3 deletions(-) > > > > diff --git a/dbus/org.selinux.policy b/dbus/org.selinux.policy > > index 01266102..9772127b 100644 > > --- a/dbus/org.selinux.policy > > +++ b/dbus/org.selinux.policy > > @@ -70,9 +70,9 @@ > > <allow_active>auth_admin_keep</allow_active> > > </defaults> > > </action> > > - <action id="org.selinux.change_policy_type"> > > - <description>SELinux write access</description> > > - <message>System policy prevents change_policy_type access to SELinux</message> > > + <action id="org.selinux.change_default_mode"> > > + <description>Change SELinux default enforcing mode</description> > > + <message>System policy prevents change_default_policy access to SELinux</message> > > <defaults> > > <allow_any>no</allow_any> > > <allow_inactive>no</allow_inactive> > > -- > > 2.20.1 > >
diff --git a/dbus/org.selinux.policy b/dbus/org.selinux.policy index 01266102..9772127b 100644 --- a/dbus/org.selinux.policy +++ b/dbus/org.selinux.policy @@ -70,9 +70,9 @@ <allow_active>auth_admin_keep</allow_active> </defaults> </action> - <action id="org.selinux.change_policy_type"> - <description>SELinux write access</description> - <message>System policy prevents change_policy_type access to SELinux</message> + <action id="org.selinux.change_default_mode"> + <description>Change SELinux default enforcing mode</description> + <message>System policy prevents change_default_policy access to SELinux</message> <defaults> <allow_any>no</allow_any> <allow_inactive>no</allow_inactive>