[selinux-policy/f14/master] - Merge with upstream

[Daniel J Walsh]

commit 18d1b68a84639b89651d4e70e5d4f1bd347b5832
Author: Dan Walsh <dwalsh at redhat.com>
Date:   Fri Aug 27 09:37:13 2010 -0400

    - Merge with upstream

 policy-F14.patch |    9 ---------
 1 files changed, 0 insertions(+), 9 deletions(-)
---
diff --git a/policy-F14.patch b/policy-F14.patch
index 5df9114..03d29f6 100644
--- a/policy-F14.patch
+++ b/policy-F14.patch
@@ -9049,15 +9049,6 @@ diff --git a/policy/modules/roles/dbadm.te b/policy/modules/roles/dbadm.te
 index 1875064..a3ddd43 100644
 --- a/policy/modules/roles/dbadm.te
 +++ b/policy/modules/roles/dbadm.te
-@@ -21,7 +21,7 @@ gen_tunable(dbadm_read_user_files, false)
- 
- role dbadm_r;
- 
--userdom_base_user_template(dbadm)
-+userdom_unpriv_user_template(dbadm)
- 
- ########################################
- #
 @@ -58,3 +58,7 @@ optional_policy(`
  optional_policy(`
  	postgresql_admin(dbadm_t, dbadm_r)