diff --git a/refpolicy/Changelog b/refpolicy/Changelog
index 575e2429..2c7256db 100644
--- a/refpolicy/Changelog
+++ b/refpolicy/Changelog
@@ -13,6 +13,7 @@
* Misc. cleanups.
* Added policies:
acct
+ bind
firstboot
gpm
howl
diff --git a/refpolicy/policy/global_tunables b/refpolicy/policy/global_tunables
index 80c2edde..8c7ae701 100644
--- a/refpolicy/policy/global_tunables
+++ b/refpolicy/policy/global_tunables
@@ -30,6 +30,10 @@ gen_tunable(cron_can_relabel,false)
## to support fcron.
gen_tunable(fcron_crond,false)
+## Allow BIND to write the master zone files.
+## Generally this is used for dynamic DNS.
+gen_tunable(named_write_master_zones,false)
+
## Allow reading of default_t files.
gen_tunable(read_default_t,false)
diff --git a/refpolicy/policy/modules/kernel/devices.fc b/refpolicy/policy/modules/kernel/devices.fc
index efe4ef23..b60f9020 100644
--- a/refpolicy/policy/modules/kernel/devices.fc
+++ b/refpolicy/policy/modules/kernel/devices.fc
@@ -77,3 +77,10 @@ ifdef(`distro_suse', `
/dev/usb/lp.* -c context_template(system_u:object_r:printer_device_t,s0)
/dev/usb/mdc800.* -c context_template(system_u:object_r:scanner_device_t,s0)
/dev/usb/scanner.* -c context_template(system_u:object_r:scanner_device_t,s0)
+
+ifdef(`distro_redhat',`
+# originally from named.fc
+/var/named/chroot/dev/null -c context_template(system_u:object_r:null_device_t,s0)
+/var/named/chroot/dev/random -c context_template(system_u:object_r:random_device_t,s0)
+/var/named/chroot/dev/zero -c context_template(system_u:object_r:zero_device_t,s0)
+')
diff --git a/refpolicy/policy/modules/services/bind.fc b/refpolicy/policy/modules/services/bind.fc
new file mode 100644
index 00000000..ecedc6c6
--- /dev/null
+++ b/refpolicy/policy/modules/services/bind.fc
@@ -0,0 +1,44 @@
+/etc/rndc.* -- context_template(system_u:object_r:named_conf_t,s0)
+/etc/rndc.key -- context_template(system_u:object_r:dnssec_t,s0)
+
+/usr/sbin/lwresd -- context_template(system_u:object_r:named_exec_t,s0)
+/usr/sbin/named -- context_template(system_u:object_r:named_exec_t,s0)
+/usr/sbin/r?ndc -- context_template(system_u:object_r:ndc_exec_t,s0)
+
+/var/run/ndc -s context_template(system_u:object_r:named_var_run_t,s0)
+
+/var/run/bind(/.*)? context_template(system_u:object_r:named_var_run_t,s0)
+
+/var/run/named(/.*)? context_template(system_u:object_r:named_var_run_t,s0)
+
+ifdef(`distro_debian',`
+/etc/bind(/.*)? context_template(system_u:object_r:named_zone_t,s0)
+/etc/bind/named\.conf -- context_template(system_u:object_r:named_conf_t,s0)
+/etc/bind/rndc\.key -- context_template(system_u:object_r:named_conf_t,s0)
+/var/cache/bind(/.*)? context_template(system_u:object_r:named_cache_t,s0)
+')
+
+ifdef(`distro_gentoo',`
+/etc/bind(/.*)? context_template(system_u:object_r:named_zone_t,s0)
+/etc/bind/named\.conf -- context_template(system_u:object_r:named_conf_t,s0)
+/etc/bind/rndc\.key -- context_template(system_u:object_r:named_conf_t,s0)
+/var/bind(/.*)? context_template(system_u:object_r:named_cache_t,s0)
+/var/bind/pri(/.*)? context_template(system_u:object_r:named_zone_t,s0)
+')
+
+ifdef(`distro_redhat',`
+/etc/named\.conf -- context_template(system_u:object_r:named_conf_t,s0)
+/var/named(/.*)? context_template(system_u:object_r:named_zone_t,s0)
+/var/named/slaves(/.*)? context_template(system_u:object_r:named_cache_t,s0)
+/var/named/data(/.*)? context_template(system_u:object_r:named_cache_t,s0)
+/var/named/named\.ca -- context_template(system_u:object_r:named_conf_t,s0)
+/var/named/chroot(/.*)? context_template(system_u:object_r:named_conf_t,s0)
+/var/named/chroot/etc(/.*)? context_template(system_u:object_r:named_conf_t,s0)
+/var/named/chroot/etc/rndc.key -- context_template(system_u:object_r:dnssec_t,s0)
+/var/named/chroot/var/run/named.* context_template(system_u:object_r:named_var_run_t,s0)
+/var/named/chroot/var/tmp(/.*)? context_template(system_u:object_r:named_cache_t,s0)
+/var/named/chroot/var/named(/.*)? context_template(system_u:object_r:named_zone_t,s0)
+/var/named/chroot/var/named/slaves(/.*)? context_template(system_u:object_r:named_cache_t,s0)
+/var/named/chroot/var/named/data(/.*)? context_template(system_u:object_r:named_cache_t,s0)
+/var/named/chroot/var/named/named\.ca -- context_template(system_u:object_r:named_conf_t,s0)
+')
diff --git a/refpolicy/policy/modules/services/bind.if b/refpolicy/policy/modules/services/bind.if
new file mode 100644
index 00000000..2b0f6b9d
--- /dev/null
+++ b/refpolicy/policy/modules/services/bind.if
@@ -0,0 +1,107 @@
+## Berkeley internet name domain DNS server.
+
+########################################
+##
+## Execute ndc in the ndc domain.
+##
+##
+## The type of the process performing this action.
+##
+#
+interface(`bind_domtrans_ndc',`
+ gen_require(`
+ type ndc_t, ndc_exec_t;
+ class process sigchld;
+ class fd use;
+ class fifo_file rw_file_perms;
+ ')
+
+ domain_auto_trans($1,ndc_exec_t,ndc_t)
+
+ allow $1 ndc_t:fd use;
+ allow ndc_t $1:fd use;
+ allow ndc_t $1:fifo_file rw_file_perms;
+ allow ndc_t $1:process sigchld;
+')
+
+########################################
+##
+## Execute ndc in the ndc domain, and
+## allow the specified role the ndc domain.
+##
+##
+## The type of the process performing this action.
+##
+##
+## The role to be allowed the bind domain.
+##
+##
+## The type of the terminal allow the bind domain to use.
+##
+#
+interface(`bind_run_ndc',`
+ gen_require(`
+ type ndc_t;
+ class chr_file rw_term_perms;
+ ')
+
+ bind_domtrans_ndc($1)
+ role $2 types ndc_t;
+ allow ndc_t $3:chr_file rw_term_perms;
+')
+
+########################################
+##
+## Read BIND named configuration files.
+##
+##
+## Domain allowed access.
+##
+#
+interface(`bind_read_config',`
+ gen_require(`
+ type named_conf_t;
+ class dir search;
+ class file { getattr read };
+ ')
+
+ allow $1 named_conf_t:dir search;
+ allow $1 named_conf_t:file { getattr read };
+')
+
+########################################
+##
+## Write BIND named configuration files.
+##
+##
+## Domain allowed access.
+##
+#
+interface(`bind_write_config',`
+ gen_require(`
+ type named_conf_t;
+ class dir search;
+ class file { write setattr };
+ ')
+
+ allow $1 named_conf_t:dir search;
+ allow $1 named_conf_t:file { write setattr };
+')
+
+########################################
+##
+## Do not audit attempts to set the attributes
+## of the BIND pid directory.
+##
+##
+## Domain allowed access.
+##
+#
+interface(`bind_setattr_pid_dir',`
+ gen_require(`
+ type named_var_run_t;
+ class dir setattr;
+ ')
+
+ allow $1 named_var_run_t:dir setattr;
+')
diff --git a/refpolicy/policy/modules/services/bind.te b/refpolicy/policy/modules/services/bind.te
new file mode 100644
index 00000000..49c4a584
--- /dev/null
+++ b/refpolicy/policy/modules/services/bind.te
@@ -0,0 +1,249 @@
+
+policy_module(bind,1.0)
+
+########################################
+#
+# Declarations
+#
+
+# for DNSSEC key files
+type dnssec_t; #, secure_file_type;
+files_type(dnssec_t)
+
+type named_t;
+type named_exec_t;
+init_daemon_domain(named_t,named_exec_t)
+role system_r types named_t;
+
+# A type for configuration files of named.
+type named_conf_t;
+files_type(named_conf_t)
+
+# for secondary zone files
+type named_cache_t;
+files_type(named_cache_t)
+
+type named_tmp_t;
+files_tmp_file(named_tmp_t)
+
+type named_var_run_t;
+files_pid_file(named_var_run_t)
+
+# for primary zone files
+type named_zone_t;
+files_type(named_zone_t)
+
+type ndc_t;
+type ndc_exec_t;
+init_system_domain(ndc_t,ndc_exec_t)
+role system_r types ndc_t;
+
+########################################
+#
+# Named local policy
+#
+
+allow named_t self:capability { chown dac_override fowner setgid setuid sys_chroot sys_nice sys_resource };
+dontaudit named_t self:capability sys_tty_config;
+allow named_t self:process { setsched setcap setrlimit };
+allow named_t self:fifo_file rw_file_perms;
+allow named_t self:unix_stream_socket create_stream_socket_perms;
+allow named_t self:unix_dgram_socket create_socket_perms;
+allow named_t self:tcp_socket create_stream_socket_perms;
+allow named_t self:udp_socket create_socket_perms;
+allow named_t self:netlink_route_socket r_netlink_socket_perms;
+
+allow named_t dnssec_t:file { getattr read };
+
+# read configuration
+allow named_t named_conf_t:dir r_dir_perms;
+allow named_t named_conf_t:file r_file_perms;
+allow named_t named_conf_t:lnk_file r_file_perms;
+
+# write cache for secondary zones
+allow named_t named_cache_t:dir rw_dir_perms;
+allow named_t named_cache_t:file create_file_perms;
+allow named_t named_cache_t:lnk_file create_lnk_perms;
+
+can_exec(named_t, named_exec_t)
+
+allow named_t named_tmp_t:dir create_dir_perms;
+allow named_t named_tmp_t:file create_file_perms;
+files_create_tmp_files(named_t, named_tmp_t, { file dir })
+
+allow named_t named_var_run_t:file create_file_perms;
+allow named_t named_var_run_t:sock_file create_file_perms;
+files_create_pid(named_t,named_var_run_t,{ file sock_file })
+
+# read zone files
+allow named_t named_zone_t:dir r_dir_perms;
+allow named_t named_zone_t:file r_file_perms;
+allow named_t named_zone_t:lnk_file r_file_perms;
+
+allow named_t ndc_t:tcp_socket { acceptfrom recvfrom };
+
+kernel_read_kernel_sysctl(named_t)
+kernel_read_system_state(named_t)
+kernel_read_network_state(named_t)
+kernel_tcp_recvfrom(named_t)
+
+corenet_tcp_sendrecv_all_if(named_t)
+corenet_raw_sendrecv_all_if(named_t)
+corenet_udp_sendrecv_all_if(named_t)
+corenet_tcp_sendrecv_all_nodes(named_t)
+corenet_udp_sendrecv_all_nodes(named_t)
+corenet_raw_sendrecv_all_nodes(named_t)
+corenet_tcp_sendrecv_all_ports(named_t)
+corenet_udp_sendrecv_all_ports(named_t)
+corenet_tcp_bind_all_nodes(named_t)
+corenet_udp_bind_all_nodes(named_t)
+corenet_tcp_bind_dns_port(named_t)
+corenet_udp_bind_dns_port(named_t)
+#corenet_tcp_bind_rndc_port(named_t)
+
+dev_read_sysfs(named_t)
+dev_read_rand(named_t)
+
+fs_getattr_all_fs(named_t)
+fs_search_auto_mountpoints(named_t)
+
+term_dontaudit_use_console(named_t)
+
+corecmd_search_sbin(named_t)
+
+domain_use_wide_inherit_fd(named_t)
+
+files_read_etc_files(named_t)
+files_read_etc_runtime_files(named_t)
+
+init_use_fd(named_t)
+init_use_script_pty(named_t)
+
+libs_use_ld_so(named_t)
+libs_use_shared_libs(named_t)
+
+logging_send_syslog_msg(named_t)
+
+miscfiles_read_localization(named_t)
+
+sysnet_read_config(named_t)
+
+userdom_dontaudit_use_unpriv_user_fd(named_t)
+userdom_dontaudit_search_sysadm_home_dir(named_t)
+
+ifdef(`targeted_policy',`
+ term_dontaudit_use_unallocated_tty(named_t)
+ term_dontaudit_use_generic_pty(named_t)
+ files_dontaudit_read_root_file(named_t)
+ #dontaudit ndc_t unlabeled_t:file { getattr read };
+')
+
+optional_policy(`nis.te',`
+ nis_use_ypbind(named_t)
+')
+
+optional_policy(`nscd.te',`
+ nscd_use_socket(named_t)
+')
+
+optional_policy(`rhgb.te',`
+ rhgb_domain(named_t)
+')
+
+optional_policy(`selinuxutil.te',`
+ seutil_sigchld_newrole(named_t)
+')
+
+optional_policy(`udev.te',`
+ udev_read_db(named_t)
+')
+
+########################################
+#
+# NDC local policy
+#
+
+# cjp: why net_admin?!
+allow ndc_t self:capability { dac_override net_admin };
+allow ndc_t self:process { fork signal_perms };
+allow ndc_t self:fifo_file { read write getattr ioctl };
+allow ndc_t self:unix_stream_socket { connect create_stream_socket_perms };
+allow ndc_t self:tcp_socket create_socket_perms;
+allow ndc_t self:netlink_route_socket r_netlink_socket_perms;
+
+allow ndc_t dnssec_t:file { getattr read };
+
+allow ndc_t named_t:tcp_socket { connectto recvfrom };
+allow ndc_t named_t:unix_stream_socket connectto;
+
+allow ndc_t named_conf_t:file { getattr read };
+
+allow ndc_t named_var_run_t:sock_file rw_file_perms;
+
+allow ndc_t named_zone_t:dir search;
+
+kernel_read_kernel_sysctl(ndc_t)
+kernel_tcp_recvfrom(ndc_t)
+
+corenet_tcp_sendrecv_all_if(ndc_t)
+corenet_raw_sendrecv_all_if(ndc_t)
+corenet_tcp_sendrecv_all_nodes(ndc_t)
+corenet_raw_sendrecv_all_nodes(ndc_t)
+corenet_tcp_sendrecv_all_ports(ndc_t)
+corenet_tcp_bind_all_nodes(ndc_t)
+
+fs_getattr_xattr_fs(ndc_t)
+
+domain_use_wide_inherit_fd(ndc_t)
+
+files_read_etc_files(ndc_t)
+files_search_pids(ndc_t)
+
+init_use_fd(ndc_t)
+init_use_script_pty(ndc_t)
+
+libs_use_ld_so(ndc_t)
+libs_use_shared_libs(ndc_t)
+
+logging_send_syslog_msg(ndc_t)
+
+miscfiles_read_localization(ndc_t)
+
+sysnet_read_config(ndc_t)
+
+# for /etc/rndc.key
+ifdef(`distro_redhat',`
+ allow ndc_t named_conf_t:dir search;
+')
+
+tunable_policy(`use_dns',`
+ allow ndc_t self:udp_socket create_socket_perms;
+ corenet_udp_sendrecv_all_if(ndc_t)
+ corenet_udp_sendrecv_all_nodes(ndc_t)
+ corenet_udp_sendrecv_dns_port(ndc_t)
+ corenet_udp_bind_all_nodes(ndc_t)
+')
+
+tunable_policy(`named_write_master_zones',`
+ allow named_t named_zone_t:dir create_dir_perms;
+ allow named_t named_zone_t:file create_file_perms;
+ allow named_t named_zone_t:lnk_file create_lnk_perms;
+')
+
+optional_policy(`mount.te',`
+ mount_send_nfs_client_request(named_t)
+')
+
+optional_policy(`nis.te',`
+ nis_use_ypbind(ndc_t)
+')
+
+optional_policy(`nscd.te',`
+ nscd_use_socket(ndc_t)
+')
+
+ifdef(`TODO',`
+can_udp_send(domain, named_t)
+can_udp_send(named_t, domain)
+can_tcp_connect(domain, named_t)
+')
diff --git a/refpolicy/policy/modules/system/init.te b/refpolicy/policy/modules/system/init.te
index 1b5c2e30..0e3d06a4 100644
--- a/refpolicy/policy/modules/system/init.te
+++ b/refpolicy/policy/modules/system/init.te
@@ -363,6 +363,20 @@ ifdef(`targeted_policy',`
unconfined_shell_domtrans(initrc_t)
')
+optional_policy(`bind.te',`
+ bind_read_config(initrc_t)
+
+ # for chmod in start script
+ bind_setattr_pid_dir(initrc_t)
+
+ # for /etc/rndc.key
+ ifdef(`distro_redhat',`
+ # Allow init script to cp localtime to named_conf_t
+ bind_write_config(initrc_t)
+ ')
+
+')
+
optional_policy(`gpm.te',`
gpm_setattr_gpmctl(initrc_t)
')
diff --git a/refpolicy/policy/modules/system/userdomain.te b/refpolicy/policy/modules/system/userdomain.te
index def32250..bd6303f8 100644
--- a/refpolicy/policy/modules/system/userdomain.te
+++ b/refpolicy/policy/modules/system/userdomain.te
@@ -120,6 +120,10 @@ ifdef(`targeted_policy',`
bootloader_run(sysadm_t,sysadm_r,admin_terminal)
')
+ optional_policy(`bind.te',`
+ bind_run_ndc(sysadm_t,sysadm_r,admin_terminal)
+ ')
+
optional_policy(`clock.te',`
clock_run(sysadm_t,sysadm_r,admin_terminal)
')