Changeset 2623

Timestamp:

02/21/08 13:58:02 (10 months ago)

Author:

pebenito

Message:

xselinux: dont deprecate user client template yet. make per-role rules unconditional.

Files:

• branches/xselinux/policy/modules/services/xserver.if (modified) (2 diffs)

branches/xselinux/policy/modules/services/xserver.if

@@ -470 +470 @@
-        #
-
+        # Device rules
+        allow $1_x_domain $2:x_device { read getattr setattr setfocus grab bell };
+
+        allow $2 { input_xevent_t $1_input_xevent_type }:x_event send;
+        allow $2 { x_rootwindow_t $1_x_domain }:x_drawable send;
+
-        mls_xwin_read_to_clearance($2)
-
-        xserver_common_x_domain_template($1,$1,$2)
-
-        tunable_policy(`xserver_object_manager',`
-                # Device rules
-                allow $1_x_domain $2:x_device { read getattr setattr setfocus grab bell };
-
-                allow $2 { input_xevent_t $1_input_xevent_type }:x_event send;
-                allow $2 { x_rootwindow_t $1_x_domain }:x_drawable send;
-        ')
-')
-
@@ -587 +585 @@
-#
-template(`xserver_user_client_template',`
-
+#
-        gen_require(`
-                type xdm_t, xdm_tmp_t;