[selinux-policy: 2332/3172] Merge branch 'master' into xselinux

[Daniel J Walsh]

commit e331a05c7759ccae9f4832c250bc3e8259c4908a
Merge: 9448ca6 46b0373
Author: Chris PeBenito <cpebenito at tresys.com>
Date:   Thu Dec 3 10:13:41 2009 -0500

    Merge branch 'master' into xselinux

 Changelog                               |    5 +-
 VERSION                                 |    2 +-
 policy/flask/access_vectors             |    1 +
 policy/modules/admin/certwatch.te       |    2 +-
 policy/modules/admin/kismet.fc          |    2 +
 policy/modules/admin/kismet.te          |   10 +-
 policy/modules/admin/mrtg.te            |    2 +-
 policy/modules/admin/portage.te         |    2 +-
 policy/modules/admin/prelink.te         |    2 +-
 policy/modules/admin/readahead.te       |    2 +-
 policy/modules/admin/tzdata.te          |    2 +
 policy/modules/admin/usermanage.te      |   10 +-
 policy/modules/admin/vpn.te             |    2 +-
 policy/modules/apps/awstats.te          |    2 +-
 policy/modules/apps/calamaris.te        |   10 +-
 policy/modules/apps/cdrecord.te         |    2 +-
 policy/modules/apps/cpufreqselector.te  |    2 +-
 policy/modules/apps/gpg.te              |   45 ++++--
 policy/modules/apps/java.te             |    2 +-
 policy/modules/apps/mozilla.if          |   44 ++++++
 policy/modules/apps/mozilla.te          |   12 ++-
 policy/modules/apps/podsleuth.te        |    4 +-
 policy/modules/apps/pulseaudio.te       |    2 +-
 policy/modules/apps/qemu.te             |    2 +-
 policy/modules/apps/screen.if           |    5 +
 policy/modules/apps/screen.te           |    2 +-
 policy/modules/apps/seunshare.if        |    8 +
 policy/modules/apps/seunshare.te        |   14 ++-
 policy/modules/apps/vmware.te           |    2 +-
 policy/modules/apps/webalizer.te        |    2 +-
 policy/modules/apps/wireshark.te        |    2 +-
 policy/modules/kernel/corecommands.fc   |   12 ++-
 policy/modules/kernel/corecommands.if   |    2 +-
 policy/modules/kernel/corecommands.te   |    2 +-
 policy/modules/kernel/corenetwork.te.in |    3 +-
 policy/modules/kernel/devices.fc        |    9 +-
 policy/modules/kernel/devices.if        |  257 ++++++++++++++++++++++++++++++-
 policy/modules/kernel/devices.te        |   34 ++++-
 policy/modules/kernel/files.if          |  228 ++++++++++++++++++++++++++-
 policy/modules/kernel/files.te          |    7 +-
 policy/modules/kernel/filesystem.fc     |    2 +-
 policy/modules/kernel/filesystem.if     |  224 ++++++++++++++++++++++++++-
 policy/modules/kernel/filesystem.te     |   14 +-
 policy/modules/kernel/kernel.if         |   48 ++++++-
 policy/modules/kernel/kernel.te         |   17 +-
 policy/modules/kernel/mcs.te            |    2 +-
 policy/modules/kernel/storage.fc        |    1 +
 policy/modules/kernel/storage.if        |    2 +-
 policy/modules/kernel/storage.te        |    4 +-
 policy/modules/kernel/terminal.fc       |    1 +
 policy/modules/kernel/terminal.if       |   39 +++++-
 policy/modules/kernel/terminal.te       |    5 +-
 policy/modules/services/cron.te         |    2 +-
 policy/modules/services/dbus.te         |    2 +-
 policy/modules/services/nscd.te         |    2 +-
 policy/modules/services/openvpn.te      |    2 +-
 policy/modules/services/policykit.te    |    2 +-
 policy/modules/services/puppet.fc       |   11 ++
 policy/modules/services/puppet.if       |   31 ++++
 policy/modules/services/puppet.te       |  234 ++++++++++++++++++++++++++++
 policy/modules/services/tgtd.fc         |    3 +
 policy/modules/services/tgtd.if         |   11 ++
 policy/modules/services/tgtd.te         |   67 ++++++++
 policy/modules/services/virt.te         |    2 +-
 policy/modules/services/xserver.te      |    2 +-
 policy/modules/system/application.if    |   20 +++-
 policy/modules/system/application.te    |    6 +-
 policy/modules/system/fstools.fc        |    1 +
 policy/modules/system/fstools.te        |    4 +-
 policy/modules/system/init.if           |   19 +++
 policy/modules/system/init.te           |    4 +
 policy/modules/system/ipsec.fc          |    3 +
 policy/modules/system/ipsec.if          |   25 +++
 policy/modules/system/ipsec.te          |   51 ++++++-
 policy/modules/system/iptables.fc       |   18 ++-
 policy/modules/system/iptables.if       |   96 ++++++++++++
 policy/modules/system/iptables.te       |   16 ++-
 policy/modules/system/iscsi.if          |   39 +++++
 policy/modules/system/iscsi.te          |    7 +-
 policy/modules/system/kdump.te          |    3 +-
 policy/modules/system/libraries.te      |    6 +-
 policy/modules/system/logging.te        |    2 +-
 policy/modules/system/lvm.if            |   38 +++++
 policy/modules/system/lvm.te            |   28 +++-
 policy/modules/system/miscfiles.if      |   64 ++++++++-
 policy/modules/system/miscfiles.te      |    2 +-
 policy/modules/system/modutils.fc       |    1 +
 policy/modules/system/modutils.if       |   45 +++++-
 policy/modules/system/modutils.te       |   57 +++++--
 policy/modules/system/raid.fc           |    1 +
 policy/modules/system/raid.te           |    9 +-
 policy/modules/system/setrans.if        |   19 +++
 policy/modules/system/setrans.te        |    2 +-
 policy/modules/system/udev.fc           |    3 +
 policy/modules/system/udev.if           |   38 +++++
 policy/modules/system/udev.te           |   33 ++++-
 policy/modules/system/unconfined.te     |    2 +-
 policy/modules/system/userdomain.te     |    2 +-
 policy/modules/system/xen.fc            |    6 +
 policy/modules/system/xen.if            |   30 ++++-
 policy/modules/system/xen.te            |  142 +++++++++++++++---
 policy/support/obj_perm_sets.spt        |    9 +-
 102 files changed, 2152 insertions(+), 189 deletions(-)
---