[selinux-policy/f15] Fix typo in ssh.if

Miroslav Grepl mgrepl at fedoraproject.org
Wed Nov 16 15:09:06 UTC 2011


commit 4cc14f264781abd66c0e1bced5ee6fe1feb20179
Author: Miroslav <mgrepl at redhat.com>
Date:   Wed Nov 16 16:08:53 2011 +0100

    Fix typo in ssh.if

 policy-F15.patch |   11 +++++------
 1 files changed, 5 insertions(+), 6 deletions(-)
---
diff --git a/policy-F15.patch b/policy-F15.patch
index 23a501e..cf7f93e 100644
--- a/policy-F15.patch
+++ b/policy-F15.patch
@@ -45925,7 +45925,7 @@ index 078bcd7..2d60774 100644
 +/root/\.ssh(/.*)?			gen_context(system_u:object_r:ssh_home_t,s0)
 +/root/\.shosts				gen_context(system_u:object_r:ssh_home_t,s0)
 diff --git a/policy/modules/services/ssh.if b/policy/modules/services/ssh.if
-index 22adaca..485666a 100644
+index 22adaca..5470260 100644
 --- a/policy/modules/services/ssh.if
 +++ b/policy/modules/services/ssh.if
 @@ -32,10 +32,10 @@
@@ -46193,7 +46193,7 @@ index 22adaca..485666a 100644
  	files_search_pids($1)
  ')
  
-@@ -643,6 +676,43 @@ interface(`ssh_agent_exec',`
+@@ -643,6 +676,42 @@ interface(`ssh_agent_exec',`
  
  ########################################
  ## <summary>
@@ -46233,11 +46233,10 @@ index 22adaca..485666a 100644
 +
 +########################################
 +## <summary>
-+>>>>>>> 6e8a117... Add ssh_dontaudit_search_home_dir
  ##	Read ssh home directory content
  ## </summary>
  ## <param name="domain">
-@@ -680,6 +750,32 @@ interface(`ssh_domtrans_keygen',`
+@@ -680,6 +749,32 @@ interface(`ssh_domtrans_keygen',`
  	domtrans_pattern($1, ssh_keygen_exec_t, ssh_keygen_t)
  ')
  
@@ -46270,7 +46269,7 @@ index 22adaca..485666a 100644
  ########################################
  ## <summary>
  ##	Read ssh server keys
-@@ -695,7 +791,7 @@ interface(`ssh_dontaudit_read_server_keys',`
+@@ -695,7 +790,7 @@ interface(`ssh_dontaudit_read_server_keys',`
  		type sshd_key_t;
  	')
  
@@ -46279,7 +46278,7 @@ index 22adaca..485666a 100644
  ')
  
  ######################################
-@@ -735,3 +831,21 @@ interface(`ssh_delete_tmp',`
+@@ -735,3 +830,21 @@ interface(`ssh_delete_tmp',`
  	files_search_tmp($1)
  	delete_files_pattern($1, sshd_tmp_t, sshd_tmp_t)
  ')


More information about the scm-commits mailing list