- up to 6.3p1; heimdal patch dropped (krb users please verify this)

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

diff --git a/openssh-chroot.patch b/openssh-chroot.patch
index 92af31d037f6ef9b9a17ea55ec2f53e3a6ad20ee..5dda773c02c44429a159adc01899ce1abf550be5 100644 (file)
--- a/openssh-chroot.patch
+++ b/openssh-chroot.patch
@@ -76,9 +76,9 @@
  #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);
+                       /* Make sure we don't attempt to chroot again */
+                       free(options.chroot_directory);
+                       options.chroot_directory = NULL;
 +#ifdef CHROOT
 +              } else if (options.use_chroot) {
 +                      user_dir = xstrdup(pw->pw_dir);