updated modules.conf from dan

refpolicy/policy/modules.conf

@@ -11,6 +11,14 @@
 # as individual loadable modules.
 #
 
+# Layer: kernel
+# Module: devices
+# Required in base
+#
+# Device nodes and interfaces for many basic system devices.
+# 
+devices = base
+
 # Layer: kernel
 # Module: filesystem
 # Required in base
@@ -51,14 +59,6 @@ terminal = base
 # 
 kernel = base
 
-# Layer: kernel
-# Module: devices
-# Required in base
-#
-# Device nodes and interfaces for many basic system devices.
-# 
-devices = base
-
 # Layer: kernel
 # Module: corenetwork
 # Required in base
@@ -125,7 +125,7 @@ kudzu = base
 #
 # Policy for the Anaconda installer.
 # 
-anaconda = off
+anaconda = base
 
 # Layer: admin
 # Module: netutils
@@ -168,14 +168,14 @@ su = base
 #
 # File system quota management
 # 
-quota = base
+quota = off
 
 # Layer: admin
 # Module: dmesg
 #
 # Policy for dmesg.
 # 
-dmesg = base
+dmesg = off
 
 # Layer: admin
 # Module: logrotate
@@ -224,7 +224,7 @@ amanda = base
 #
 # Web server log analysis
 # 
-webalizer = module
+webalizer = base
 
 # Layer: apps
 # Module: loadkeys
@@ -259,7 +259,14 @@ storage = base
 #
 # RPC port mapping service.
 # 
-portmap = module
+portmap = base
+
+# Layer: services
+# Module: apm
+#
+# Advanced power management daemon
+# 
+apm = base
 
 # Layer: services
 # Module: remotelogin
@@ -268,13 +275,6 @@ portmap = module
 # 
 remotelogin = base
 
-# Layer: services
-# Module: ntp
-#
-# Network time protocol daemon
-# 
-ntp = base
-
 # Layer: services
 # Module: rlogin
 #
@@ -283,11 +283,25 @@ ntp = base
 rlogin = base
 
 # Layer: services
-# Module: inetd
+# Module: postfix
 #
-# Internet services daemon.
+# Postfix email server
 # 
-inetd = base
+postfix = base
+
+# Layer: services
+# Module: cyrus
+#
+# Cyrus is an IMAP service intended to be run on sealed servers
+# 
+cyrus = base
+
+# Layer: services
+# Module: rsync
+#
+# Fast incremental file transfer for synchronization
+# 
+rsync = base
 
 # Layer: services
 # Module: ktalk
@@ -304,11 +318,11 @@ ktalk = base
 finger = base
 
 # Layer: services
-# Module: howl
+# Module: cron
 #
-# Port of Apple Rendezvous multicast DNS
+# Periodic execution of scheduled commands.
 # 
-howl = base
+cron = base
 
 # Layer: services
 # Module: tftp
@@ -318,11 +332,11 @@ howl = base
 tftp = base
 
 # Layer: services
-# Module: kerberos
+# Module: canna
 #
-# MIT Kerberos admin and KDC
+# Canna - kana-kanji conversion server
 # 
-kerberos = base
+canna = base
 
 # Layer: services
 # Module: gpm
@@ -332,39 +346,25 @@ kerberos = base
 gpm = off
 
 # Layer: services
-# Module: uucp
+# Module: nscd
 #
-# Unix to Unix Copy
+# Name service cache daemon
 # 
-uucp = base
+nscd = base
-
-# Layer: services
-# Module: apache
-#
-# Apache web server
-# 
-apache = module
-
-# Layer: services
-# Module: dhcp
-#
-# Dynamic host configuration protocol (DHCP) server
-# 
-dhcp = module
-
-# Layer: services
-# Module: inn
-#
-# Internet News NNTP server
-# 
-inn = base
 
 # Layer: services
 # Module: sendmail
 #
 # Policy for sendmail.
 # 
-sendmail = off
+sendmail = base
+
+# Layer: services
+# Module: stunnel
+#
+# SSL Tunneling Proxy
+# 
+stunnel = base
 
 # Layer: services
 # Module: dbus
@@ -374,11 +374,25 @@ sendmail = off
 dbus = base
 
 # Layer: services
-# Module: rshd
+# Module: ftp
 #
-# Remote shell service.
+# File transfer protocol service
 # 
-rshd = base
+ftp = base
+
+# Layer: services
+# Module: dbskk
+#
+# Dictionary server for the SKK Japanese input method system.
+# 
+dbskk = base
+
+# Layer: services
+# Module: tcpd
+#
+# Policy for TCP daemon.
+# 
+tcpd = base
 
 # Layer: services
 # Module: radvd
@@ -387,6 +401,13 @@ rshd = base
 # 
 radvd = base
 
+# Layer: services
+# Module: rshd
+#
+# Remote shell service.
+# 
+rshd = base
+
 # Layer: services
 # Module: sasl
 #
@@ -399,63 +420,49 @@ sasl = base
 #
 # PostgreSQL relational database
 # 
-postgresql = module
+postgresql = base
 
 # Layer: services
-# Module: hal
+# Module: ntp
 #
-# Hardware abstraction layer
+# Network time protocol daemon
 # 
-hal = base
+ntp = base
-
-# Layer: services
-# Module: zebra
-#
-# Zebra border gateway protocol network routing service
-# 
-zebra = base
 
 # Layer: services
 # Module: ldap
 #
 # OpenLDAP directory server
 # 
-ldap = module
+ldap = base
 
 # Layer: services
-# Module: mysql
+# Module: inetd
 #
-# Policy for MySQL
+# Internet services daemon.
 # 
-mysql = module
+inetd = base
 
 # Layer: services
-# Module: bind
+# Module: apache
 #
-# Berkeley internet name domain DNS server.
+# Apache web server
 # 
-bind = module
+apache = base
-
-# Layer: services
-# Module: snmp
-#
-# Simple network management protocol services
-# 
-snmp = module
 
 # Layer: services
 # Module: squid
 #
 # Squid caching http proxy server
 # 
-squid = module
+squid = base
 
 # Layer: services
-# Module: mailman
+# Module: howl
 #
-# Mailman is for managing electronic mail discussion and e-newsletter lists
+# Port of Apple Rendezvous multicast DNS
 # 
-mailman = module
+howl = base
 
 # Layer: services
 # Module: dictd
@@ -465,11 +472,25 @@ mailman = module
 dictd = base
 
 # Layer: services
-# Module: privoxy
+# Module: kerberos
 #
-# Privacy enhancing web proxy.
+# MIT Kerberos admin and KDC
 # 
-privoxy = base
+kerberos = base
+
+# Layer: services
+# Module: radius
+#
+# RADIUS authentication and accounting server.
+# 
+radius = base
+
+# Layer: services
+# Module: uucp
+#
+# Unix to Unix Copy
+# 
+uucp = base
 
 # Layer: services
 # Module: nis
@@ -478,12 +499,154 @@ privoxy = base
 # 
 nis = base
 
+# Layer: services
+# Module: dhcp
+#
+# Dynamic host configuration protocol (DHCP) server
+# 
+dhcp = base
+
+# Layer: services
+# Module: samba
+#
+# SMB and CIFS client/server programs for UNIX and
+# name  Service  Switch  daemon for resolving names
+# from Windows NT servers.
+# 
+samba = base
+
 # Layer: services
 # Module: telnet
 #
 # Telnet daemon
 # 
-telnet = off
+telnet = base
+
+# Layer: services
+# Module: inn
+#
+# Internet News NNTP server
+# 
+inn = base
+
+# Layer: services
+# Module: ssh
+#
+# Secure shell client and server policy.
+# 
+ssh = base
+
+# Layer: services
+# Module: networkmanager
+#
+# Manager for dynamically switching between networks.
+# 
+networkmanager = base
+
+# Layer: services
+# Module: xdm
+#
+# X windows login display manager
+# 
+xdm = base
+
+# Layer: services
+# Module: arpwatch
+#
+# Ethernet activity monitor.
+# 
+arpwatch = base
+
+# Layer: services
+# Module: distcc
+#
+# Distributed compiler daemon
+# 
+distcc = off
+
+# Layer: services
+# Module: mta
+#
+# Policy common to all email tranfer agents.
+# 
+mta = base
+
+# Layer: services
+# Module: zebra
+#
+# Zebra border gateway protocol network routing service
+# 
+zebra = base
+
+# Layer: services
+# Module: hal
+#
+# Hardware abstraction layer
+# 
+hal = base
+
+# Layer: services
+# Module: cpucontrol
+#
+# Services for loading CPU microcode and CPU frequency scaling.
+# 
+cpucontrol = base
+
+# Layer: services
+# Module: mysql
+#
+# Policy for MySQL
+# 
+mysql = base
+
+# Layer: services
+# Module: cups
+#
+# Common UNIX printing system
+# 
+cups = base
+
+# Layer: services
+# Module: bind
+#
+# Berkeley internet name domain DNS server.
+# 
+bind = base
+
+# Layer: services
+# Module: snmp
+#
+# Simple network management protocol services
+# 
+snmp = base
+
+# Layer: services
+# Module: spamassassin
+#
+# Filter used for removing unsolicited email.
+# 
+spamassassin = base
+
+# Layer: services
+# Module: mailman
+#
+# Mailman is for managing electronic mail discussion and e-newsletter lists
+# 
+mailman = base
+
+# Layer: services
+# Module: lpd
+#
+# Line printer daemon
+# 
+lpd = base
+
+# Layer: services
+# Module: privoxy
+#
+# Privacy enhancing web proxy.
+# 
+privoxy = base
 
 # Layer: services
 # Module: comsat
@@ -492,13 +655,6 @@ telnet = off
 # 
 comsat = base
 
-# Layer: services
-# Module: ssh
-#
-# Secure shell client and server policy.
-# 
-ssh = off
-
 # Layer: services
 # Module: cvs
 #
@@ -514,11 +670,11 @@ cvs = base
 ppp = base
 
 # Layer: services
-# Module: arpwatch
+# Module: dovecot
 #
-# Ethernet activity monitor.
+# Dovecot POP and IMAP mail server
 # 
-arpwatch = base
+dovecot = base
 
 # Layer: services
 # Module: bluetooth
@@ -527,127 +683,6 @@ arpwatch = base
 # 
 bluetooth = base
 
-# Layer: services
-# Module: apm
-#
-# Advanced power management daemon
-# 
-apm = base
-
-# Layer: services
-# Module: mta
-#
-# Policy common to all email tranfer agents.
-# 
-mta = base
-
-# Layer: services
-# Module: nscd
-#
-# Name service cache daemon
-# 
-nscd = base
-
-# Layer: services
-# Module: stunnel
-#
-# SSL Tunneling Proxy
-# 
-stunnel = base
-
-# Layer: services
-# Module: distcc
-#
-# Distributed compiler daemon
-# 
-distcc = off
-
-# Layer: services
-# Module: samba
-#
-# SMB and CIFS client/server programs for UNIX and
-# name  Service  Switch  daemon for resolving names
-# from Windows NT servers.
-# 
-samba = module
-
-# Layer: services
-# Module: cyrus
-#
-# Cyrus is an IMAP service intended to be run on sealed servers
-# 
-cyrus = base
-
-# Layer: services
-# Module: ftp
-#
-# File transfer protocol service
-# 
-ftp = base
-
-# Layer: services
-# Module: cpucontrol
-#
-# Services for loading CPU microcode and CPU frequency scaling.
-# 
-cpucontrol = base
-
-# Layer: services
-# Module: dovecot
-#
-# Dovecot POP and IMAP mail server
-# 
-dovecot = base
-
-# Layer: services
-# Module: rsync
-#
-# Fast incremental file transfer for synchronization
-# 
-rsync = base
-
-# Layer: services
-# Module: canna
-#
-# Canna - kana-kanji conversion server
-# 
-canna = base
-
-# Layer: services
-# Module: cron
-#
-# Periodic execution of scheduled commands.
-# 
-cron = base
-
-# Layer: services
-# Module: tcpd
-#
-# Policy for TCP daemon.
-# 
-tcpd = base
-
-# Layer: services
-# Module: xdm
-#
-# X windows login display manager
-# 
-xdm = base
-
-# Layer: services
-# Module: networkmanager
-#
-# Manager for dynamically switching between networks.
-# 
-networkmanager = base
-
-# Layer: services
-# Module: dbskk
-#
-# Dictionary server for the SKK Japanese input method system.
-# 
-dbskk = base
-
 # Layer: services
 # Module: pegasus
 #
@@ -655,34 +690,6 @@ dbskk = base
 # 
 pegasus = base
 
-# Layer: services
-# Module: radius
-#
-# RADIUS authentication and accounting server.
-# 
-radius = base
-
-# Layer: services
-# Module: spamassassin
-#
-# Filter used for removing unsolicited email.
-# 
-spamassassin = base
-
-# Layer: services
-# Module: postfix
-#
-# Postfix email server
-# 
-postfix = base
-
-# Layer: services
-# Module: cups
-#
-# Common UNIX printing system
-# 
-cups = base
-
 # Layer: services
 # Module: rpc
 #
@@ -690,13 +697,6 @@ cups = base
 # 
 rpc = base
 
-# Layer: services
-# Module: lpd
-#
-# Line printer daemon
-# 
-lpd = base
-
 # Layer: system
 # Module: unconfined
 #
@@ -737,7 +737,7 @@ mount = base
 #
 # TCP/IP encryption
 # 
-ipsec = base
+ipsec = off
 
 # Layer: system
 # Module: locallogin
@@ -779,7 +779,7 @@ pcmcia = base
 #
 # Policy for iptables.
 # 
-iptables = base
+iptables = off
 
 # Layer: system
 # Module: userdomain