]> git.ipfire.org Git - people/stevee/selinux-policy.git/commit - policy/modules/apps/sambagui.te
Merge branch 'master' of ssh://git.fedorahosted.org/git/selinux-policy; branch 'maste...
authorDan Walsh <dwalsh@redhat.com>
Fri, 10 Sep 2010 17:02:25 +0000 (13:02 -0400)
committerDan Walsh <dwalsh@redhat.com>
Fri, 10 Sep 2010 17:02:25 +0000 (13:02 -0400)
commitcab9bc9c58cb60c3a98053ab9fc2b781c68f0fed
tree957ba5f8856d9881a28f8bbd1e1f65b55a5e661c
parentd7544f0d2517b222bab84ad492fc1a940385a7db
parentda12b548025af9795fcd0f210ad1e4a0c9f0e8fe
Merge branch 'master' of ssh://git.fedorahosted.org/git/selinux-policy; branch 'master' of http://oss.tresys.com/git/refpolicy

Conflicts:
policy/modules/admin/amanda.if
policy/modules/system/init.te
policy/modules/system/miscfiles.if
policy/modules/system/miscfiles.te
policy/modules/system/userdomain.if
33 files changed:
policy/modules/admin/anaconda.te
policy/modules/admin/certwatch.te
policy/modules/services/abrt.te
policy/modules/services/amavis.te
policy/modules/services/apache.te
policy/modules/services/automount.te
policy/modules/services/avahi.te
policy/modules/services/bind.te
policy/modules/services/certmaster.if
policy/modules/services/certmaster.te
policy/modules/services/certmonger.te
policy/modules/services/cyrus.te
policy/modules/services/dbus.te
policy/modules/services/dovecot.te
policy/modules/services/exim.te
policy/modules/services/fetchmail.te
policy/modules/services/ldap.te
policy/modules/services/networkmanager.te
policy/modules/services/openvpn.te
policy/modules/services/postfix.if
policy/modules/services/radius.te
policy/modules/services/rpc.te
policy/modules/services/sasl.te
policy/modules/services/sendmail.te
policy/modules/services/ssh.if
policy/modules/services/virt.te
policy/modules/services/w3c.te
policy/modules/system/authlogin.if
policy/modules/system/authlogin.te
policy/modules/system/init.te
policy/modules/system/miscfiles.if
policy/modules/system/miscfiles.te
policy/modules/system/userdomain.if