cab9bc Merge branch 'master' of ssh://git.fedorahosted.org/git/selinux-policy; branch 'master' of http://oss.tresys.com/git/refpolicy

Merged and Committed by Dan Walsh 14 years ago
41 files changed. 143 lines added. 104 lines removed.
policy/modules/admin/amanda.fc
file modified
+1 -3
policy/modules/admin/amanda.if
file modified
+18 -22
policy/modules/admin/amanda.te
file modified
+3 -22
policy/modules/admin/amtu.if
file modified
+5 -4
policy/modules/admin/anaconda.fc
file modified
+1 -5
policy/modules/admin/anaconda.if
file modified
+1 -1
policy/modules/admin/anaconda.te
file modified
+0 -1
policy/modules/admin/certwatch.te
file modified
+2 -2
policy/modules/apps/evolution.te
file modified
+2 -2
policy/modules/services/abrt.te
file modified
+1 -1
policy/modules/services/amavis.te
file modified
+1 -1
policy/modules/services/apache.te
file modified
+1 -1
policy/modules/services/automount.te
file modified
+1 -1
policy/modules/services/avahi.te
file modified
+1 -1
policy/modules/services/bind.te
file modified
+1 -1
policy/modules/services/certmaster.if
file modified
+2 -2
policy/modules/services/certmaster.te
file modified
+3 -3
policy/modules/services/certmonger.te
file modified
+1 -1
policy/modules/services/cyrus.te
file modified
+1 -1
policy/modules/services/dbus.te
file modified
+1 -1
policy/modules/services/dovecot.te
file modified
+1 -1
policy/modules/services/exim.te
file modified
+1 -1
policy/modules/services/fetchmail.te
file modified
+1 -1
policy/modules/services/ldap.te
file modified
+1 -1
policy/modules/services/networkmanager.te
file modified
+1 -1
policy/modules/services/openvpn.te
file modified
+1 -1
policy/modules/services/postfix.if
file modified
+1 -1
policy/modules/services/radius.te
file modified
+1 -1
policy/modules/services/rpc.te
file modified
+2 -2
policy/modules/services/sasl.te
file modified
+1 -1
policy/modules/services/sendmail.te
file modified
+1 -1
policy/modules/services/squid.te
file modified
+1 -1
policy/modules/services/ssh.if
file modified
+1 -1
policy/modules/services/virt.te
file modified
+1 -1
policy/modules/services/w3c.te
file modified
+1 -1
policy/modules/system/authlogin.if
file modified
+2 -2
policy/modules/system/authlogin.te
file modified
+1 -1
policy/modules/system/init.te
file modified
+1 -1
policy/modules/system/miscfiles.if
file modified
+71 -6
policy/modules/system/miscfiles.te
file modified
+1 -1
policy/modules/system/userdomain.if
file modified
+4 -1
    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
    
        
file modified
+18 -22
file modified
+5 -4