← Back to branch summary

~ubuntu-branches/ubuntu/natty/refpolicy-ubuntu/natty

« back to all changes in this revision

Viewing changes to debian/patches/ssh.patch

  • Committer: Bazaar Package Importer
  • Author(s): Kees Cook
  • Date: 2010-04-22 17:10:43 UTC
  • mfrom: (1.1.2 upstream)
  • Revision ID: james.westby@ubuntu.com-20100422171043-khrw2m21gser7icb
Tags: 0.2.20091117-0ubuntu1
https://launchpad.net/bugs/568744
* New upstream release, converted to source format 3.
* Updated Ubuntu-specific patches thanks to Steve Lawrence (LP: #568744).
* Extracted Makefile change to debian/patches/bashisms.patch.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/ssh.patch
3
3
 policy/modules/services/ssh.te |    6 ++++++
4
4
 2 files changed, 8 insertions(+)
5
5
 
6
 
Index: refpolicy-ubuntu-0.2.20090730/policy/modules/services/ssh.fc
 
6
Index: refpolicy-ubuntu-0.2.20091117/policy/modules/services/ssh.fc
7
7
===================================================================
8
 
--- refpolicy-ubuntu-0.2.20090730.orig/policy/modules/services/ssh.fc
9
 
+++ refpolicy-ubuntu-0.2.20090730/policy/modules/services/ssh.fc
 
8
--- refpolicy-ubuntu-0.2.20091117.orig/policy/modules/services/ssh.fc   2010-04-22 17:31:48.189299232 -0700
 
9
+++ refpolicy-ubuntu-0.2.20091117/policy/modules/services/ssh.fc        2010-04-22 17:45:08.020684764 -0700
10
10
@@ -1,4 +1,6 @@
11
11
 HOME_DIR/\.ssh(/.*)?                   gen_context(system_u:object_r:home_ssh_t,s0)
12
12
+/root/\.ssh(/.*)?                      gen_context(unconfined_u:object_r:home_ssh_t,s0)
14
14
 
15
15
 /etc/ssh/primes                        --      gen_context(system_u:object_r:sshd_key_t,s0)
16
16
 /etc/ssh/ssh_host_key          --      gen_context(system_u:object_r:sshd_key_t,s0)
17
 
Index: refpolicy-ubuntu-0.2.20090730/policy/modules/services/ssh.te
 
17
Index: refpolicy-ubuntu-0.2.20091117/policy/modules/services/ssh.te
18
18
===================================================================
19
 
--- refpolicy-ubuntu-0.2.20090730.orig/policy/modules/services/ssh.te
20
 
+++ refpolicy-ubuntu-0.2.20090730/policy/modules/services/ssh.te
21
 
@@ -310,6 +310,8 @@ term_relabelto_all_user_ptys(sshd_t)
 
19
--- refpolicy-ubuntu-0.2.20091117.orig/policy/modules/services/ssh.te   2010-04-22 17:31:48.199258886 -0700
 
20
+++ refpolicy-ubuntu-0.2.20091117/policy/modules/services/ssh.te        2010-04-22 17:45:08.020684764 -0700
 
21
@@ -310,6 +310,8 @@
22
22
 corenet_tcp_bind_xserver_port(sshd_t)
23
23
 corenet_sendrecv_xserver_server_packets(sshd_t)
24
24
 
27
27
 tunable_policy(`ssh_sysadm_login',`
28
28
        # Relabel and access ptys created by sshd
29
29
        # ioctl is necessary for logout() processing for utmp entry and for w to
30
 
@@ -323,6 +325,10 @@ tunable_policy(`ssh_sysadm_login',`
 
30
@@ -323,6 +325,10 @@
31
31
 ')
32
32
 
33
33
 optional_policy(`