]> git.ipfire.org Git - people/stevee/selinux-policy.git/commit - policy/modules/services/procmail.te
Merge branch 'master' of http://oss.tresys.com/git/refpolicy
authorDan Walsh <dwalsh@redhat.com>
Thu, 7 Oct 2010 18:06:33 +0000 (14:06 -0400)
committerDan Walsh <dwalsh@redhat.com>
Thu, 7 Oct 2010 18:06:33 +0000 (14:06 -0400)
commit4c437c88cbc96a8610aa5b62c4313853810180f2
tree1d931ce825a47d9b0f2d547094085ba82e12eeaf
parent38539254494606547a300b345cf8d7839703cb23
parentbd51fa387ca034a76539cf61c1e028bdc3076cb9
Merge branch 'master' of http://oss.tresys.com/git/refpolicy

Conflicts:
policy/modules/admin/rpm.if
policy/modules/admin/shutdown.fc
policy/modules/admin/shutdown.te
policy/modules/kernel/corenetwork.te.in
policy/modules/roles/staff.te
policy/modules/roles/unprivuser.te
policy/modules/system/unconfined.te
policy/modules/system/userdomain.if
21 files changed:
Makefile
policy/modules/admin/alsa.if
policy/modules/admin/brctl.if
policy/modules/admin/consoletype.te
policy/modules/admin/logrotate.te
policy/modules/admin/netutils.te
policy/modules/admin/rpm.if
policy/modules/admin/rpm.te
policy/modules/admin/shutdown.if
policy/modules/admin/shutdown.te
policy/modules/admin/tzdata.te
policy/modules/admin/usermanage.if
policy/modules/admin/usermanage.te
policy/modules/kernel/corenetwork.te.in
policy/modules/roles/staff.te
policy/modules/roles/sysadm.te
policy/modules/roles/unprivuser.te
policy/modules/system/init.if
policy/modules/system/unconfined.te
policy/modules/system/userdomain.if
policy/modules/system/userdomain.te