ensure --with-privsep-user param

[packages/openssh.git] / openssh-chroot.patch

diff --git a/openssh-chroot.patch b/openssh-chroot.patch
index 0e295db9778126f77344f95d8320266e986b768c..3c93ac0d5dc028f0d7575ab70f111aef800777b4 100644 (file)
--- a/openssh-chroot.patch
+++ b/openssh-chroot.patch
@@ -64,21 +64,21 @@
                                         * poke the client this often to
 --- ./session.c.org    2008-05-05 16:22:11.935003283 +0200
 +++ ./session.c        2008-05-05 16:32:50.025507650 +0200
-@@ -1345,6 +1345,10 @@ void
- do_setusercontext(struct passwd *pw)
- {
-       char *chroot_path, *tmp;
+@@ -1492,6 +1492,10 @@ do_setusercontext(struct passwd *pw)
+ #ifdef USE_LIBIAF
+       int doing_chroot = 0;
+ #endif
 +#ifdef CHROOT
 +      char *user_dir;
 +      char *new_root;
 +#endif /* CHROOT */
  
- #ifdef WITH_SELINUX
-       /* Cache selinux status for later use */
-@@ -1425,8 +1429,28 @@ do_setusercontext(struct passwd *pw)
-                       safely_chroot(chroot_path, pw->pw_uid);
-                       free(tmp);
-                       free(chroot_path);
+       platform_setusercontext(pw);
+ 
+@@ -1534,6 +1538,25 @@ do_setusercontext(struct passwd *pw)
+ #ifdef USE_LIBIAF
+                       doing_chroot = 1;
+ #endif
 +#ifdef CHROOT
 +              } else if (options.use_chroot) {
 +                      user_dir = xstrdup(pw->pw_dir);
@@ -100,23 +100,20 @@
 +#endif /* CHROOT */
                }
  
-+
  #ifdef HAVE_LOGIN_CAP
-               if (setusercontext(lc, pw, pw->pw_uid, LOGIN_SETUSER) < 0) {
-                       perror("unable to set user context (setuser)");
 --- openssh-3.7.1p2/sshd_config        2003-09-02 14:51:18.000000000 +0200
 +++ openssh-3.7.1p2.pius/sshd_config   2003-10-07 20:49:08.000000000 +0200
-@@ -71,6 +71,10 @@
- # bypass the setting of 'PasswordAuthentication'
- #UsePAM yes
+@@ -91,6 +91,10 @@
+ # and ChallengeResponseAuthentication to 'no'.
+ UsePAM yes
  
 +# Set this to 'yes' to enable support for chrooted user environment.
-+# You must create such environment before you can use this feature. 
++# You must create such environment before you can use this feature.
 +#UseChroot yes
 +
- #AllowTcpForwarding yes
- #GatewayPorts no
- #X11Forwarding no
+ #AllowAgentForwarding yes
+ # Security advisory:
+ # http://securitytracker.com/alerts/2004/Sep/1011143.html
 --- openssh-4.4p1/sshd_config.0.orig   2006-09-26 13:03:48.000000000 +0200
 +++ openssh-4.4p1/sshd_config.0        2006-10-05 10:11:41.615971000 +0200
 @@ -451,6 +451,16 @@