b25a519 Merge http://oss.tresys.com/git/refpolicy-contrib into master_contrib_merge

Merged and Committed by mgrepl 11 years ago
57 files changed. 95 lines added. 58 lines removed.
amanda.te
file modified
+1 -1
amavis.te
file modified
+1 -1
apache.te
file modified
+6 -1
asterisk.te
file modified
+1 -1
authbind.te
file modified
+1 -1
bcfg2.if
file modified
+2 -2
bcfg2.te
file modified
+2 -2
bind.te
file modified
+5 -0
blueman.if
file modified
+1 -1
clamav.te
file modified
+1 -1
courier.te
file modified
+1 -1
cups.te
file modified
+1 -1
cyrus.te
file modified
+1 -1
dbus.te
file modified
+1 -1
dhcp.te
file modified
+1 -1
dpkg.te
file modified
+1 -1
ftp.te
file modified
+1 -1
git.te
file modified
+1 -1
gpg.te
file modified
+1 -1
inn.te
file modified
+1 -1
java.fc
file modified
+1 -1
java.te
file modified
+1 -1
ldap.if
file modified
+1 -1
mailman.te
file modified
+1 -1
mozilla.te
file modified
+1 -1
mta.te
file modified
+1 -1
nagios.te
file modified
+1 -1
nessus.te
file modified
+1 -1
nis.te
file modified
+1 -1
nslcd.te
file modified
+7 -1
oddjob.te
file modified
+1 -1
portage.fc
file modified
+2 -0
portage.if
file modified
+1 -0
portage.te
file modified
+7 -1
postfix.te
file modified
+1 -1
puppet.te
file modified
+1 -1
qemu.te
file modified
+1 -1
raid.te
file modified
+1 -1
rgmanager.te
file modified
+1 -1
rlogin.te
file modified
+1 -1
rpc.te
file modified
+1 -1
rpm.fc
file modified
+1 -0
rpm.te
file modified
+1 -1
rsync.te
file modified
+1 -1
samba.te
file modified
+1 -1
snmp.te
file modified
+1 -1
sosreport.te
file modified
+1 -1
squid.te
file modified
+1 -1
sssd.te
file modified
+0 -2
sxid.te
file modified
+1 -1
sysstat.te
file modified
+1 -1
telepathy.if
file modified
+2 -3
telepathy.te
file modified
+1 -1
virt.te
file modified
+1 -1
vmware.te
file modified
+1 -1
xen.te
file modified
+1 -1
zarafa.te
file modified
+15 -1
    Merge http://oss.tresys.com/git/refpolicy-contrib into master_contrib_merge
    
    Conflicts:
    	bcfg2.fc
    	bcfg2.if
    	bcfg2.te
    	blueman.fc
    	blueman.if
    	blueman.te
    	gpg.te
    	kerberos.te
    	nagios.te
    	nslcd.te
    	postfix.te
    	samba.te
    	sssd.te
    	telepathy.if
    	telnet.te
    	virt.if
    	zarafa.te
    
        
file modified
+1 -1
file modified
+1 -1
file modified
+6 -1
file modified
+1 -1
file modified
+1 -1
file modified
+2 -2
file modified
+2 -2
file modified
+5 -0
file modified
+1 -1
file modified
+1 -1
file modified
+1 -1
file modified
+1 -1
file modified
+1 -1
file modified
+1 -1
file modified
+1 -1
file modified
+1 -1
file modified
+1 -1
file modified
+1 -1
file modified
+1 -1
file modified
+1 -1
file modified
+1 -1
file modified
+1 -1
file modified
+1 -1
file modified
+1 -1
file modified
+1 -1
file modified
+1 -1
file modified
+1 -1
file modified
+1 -1
file modified
+1 -1
file modified
+7 -1
file modified
+1 -1
file modified
+2 -0
file modified
+1 -0
file modified
+7 -1
file modified
+1 -1
file modified
+1 -1
file modified
+1 -1
file modified
+1 -1
file modified
+1 -1
file modified
+1 -1
file modified
+1 -1
file modified
+1 -0
file modified
+1 -1
file modified
+1 -1
file modified
+1 -1
file modified
+1 -1
file modified
+1 -1
file modified
+1 -1
file modified
+0 -2
file modified
+1 -1
file modified
+1 -1
file modified
+2 -3
file modified
+1 -1
file modified
+1 -1
file modified
+1 -1
file modified
+1 -1
file modified
+15 -1