[selinux-policy: 3145/3172] Merge branch 'base'

[Daniel J Walsh]

commit ff9b16dc29ef444b04d05ea2ce6fe048b8bfa37b
Merge: e027e93 71f455a
Author: Dominick Grift <domg472 at gmail.com>
Date:   Fri Sep 24 12:52:43 2010 +0200

    Merge branch 'base'

 policy/modules/apps/gnome.if            |    1 +
 policy/modules/services/git.fc          |    2 +-
 policy/modules/services/razor.te        |  192 +++++++++++++++----------------
 policy/modules/services/rgmanager.te    |    9 +-
 policy/modules/services/rhcs.te         |   14 +--
 policy/modules/services/rhgb.te         |    2 +-
 policy/modules/services/ricci.te        |    4 +-
 policy/modules/services/rlogin.te       |    5 +-
 policy/modules/services/rpc.te          |   23 ++--
 policy/modules/services/snmp.te         |    4 +-
 policy/modules/services/snort.te        |    6 +-
 policy/modules/services/spamassassin.te |  151 ++++++++++++-------------
 policy/modules/services/squid.te        |   14 +-
 policy/modules/services/ssh.te          |   91 +++++++--------
 policy/modules/services/sssd.te         |    5 +-
 policy/modules/services/stunnel.te      |   21 ++--
 policy/modules/services/sysstat.te      |    2 -
 policy/modules/services/tcpd.te         |    1 -
 policy/modules/services/telnet.te       |   19 ++--
 policy/modules/services/tftp.te         |   12 +-
 policy/modules/services/tgtd.te         |    2 +-
 policy/modules/services/tor.te          |   11 +-
 policy/modules/services/ucspitcp.te     |    7 +-
 policy/modules/services/ulogd.te        |    5 +-
 policy/modules/services/uptime.te       |    2 +-
 policy/modules/services/uucp.te         |    3 +-
 policy/modules/services/varnishd.te     |   12 +-
 policy/modules/services/vhostmd.te      |    2 +-
 policy/modules/services/virt.te         |   52 ++++-----
 policy/modules/services/vnstatd.if      |    4 +-
 policy/modules/services/vnstatd.te      |   12 +--
 policy/modules/services/xserver.te      |  173 +++++++++++++--------------
 policy/modules/services/zabbix.te       |    4 +-
 policy/modules/services/zarafa.te       |    5 +-
 policy/modules/services/zebra.te        |    9 +-
 policy/modules/services/zosremote.te    |    2 +-
 policy/modules/system/init.te           |    2 +-
 37 files changed, 412 insertions(+), 473 deletions(-)
---