[selinux-policy/f16] Fix jockey.if

[Miroslav Grepl]

commit 39be1dcca796dcecadd9fdb29af33e054cd75bc8
Author: Miroslav Grepl <mgrepl at redhat.com>
Date:   Fri Apr 13 16:24:34 2012 +0200

    Fix jockey.if

 policy-F16.patch |   11 ++++-------
 1 files changed, 4 insertions(+), 7 deletions(-)
---
diff --git a/policy-F16.patch b/policy-F16.patch
index df419aa..a9cd17e 100644
--- a/policy-F16.patch
+++ b/policy-F16.patch
@@ -8022,7 +8022,7 @@ index 0000000..274cdec
 +/var/log/jockey\.log	--	gen_context(system_u:object_r:jockey_var_log_t,s0)
 diff --git a/policy/modules/apps/jockey.if b/policy/modules/apps/jockey.if
 new file mode 100644
-index 0000000..b083ea3
+index 0000000..2a83f6e
 --- /dev/null
 +++ b/policy/modules/apps/jockey.if
 @@ -0,0 +1,133 @@
@@ -8083,7 +8083,7 @@ index 0000000..b083ea3
 +	')
 +
 +	files_search_var($1)
-+	read_files_pattern($1, jockey_cache_t jockey_cache_t)
++	read_files_pattern($1, jockey_cache_t, jockey_cache_t)
 +')
 +
 +########################################
@@ -42428,10 +42428,10 @@ index 0000000..6b27066
 +/var/run/xl2tpd\.pid	--	gen_context(system_u:object_r:l2tpd_var_run_t,s0)
 diff --git a/policy/modules/services/l2tpd.if b/policy/modules/services/l2tpd.if
 new file mode 100644
-index 0000000..eb6ac8d
+index 0000000..cd14d24
 --- /dev/null
 +++ b/policy/modules/services/l2tpd.if
-@@ -0,0 +1,156 @@
+@@ -0,0 +1,153 @@
 +## <summary>Layer 2 Tunneling Protocol daemons.</summary>
 +
 +########################################
@@ -42471,8 +42471,6 @@ index 0000000..eb6ac8d
 +	init_labeled_script_domtrans($1, l2tpd_initrc_exec_t)
 +')
 +
-+<<<<<<< HEAD
-+=======
 +########################################
 +## <summary>
 +##	Send to l2tpd via a unix dgram socket.
@@ -42509,7 +42507,6 @@ index 0000000..eb6ac8d
 +
 +	allow $1 l2tpd_t:socket rw_socket_perms;
 +')
-+>>>>>>> 37639db... Add support for proL2TPd.
 +
 +########################################
 +## <summary>