diff -up openssh-6.1p1/openbsd-compat/port-linux.c.privsep-selinux openssh-6.1p1/openbsd-compat/port-linux.c

--- openssh-6.1p1/openbsd-compat/port-linux.c.privsep-selinux	2012-11-05 14:46:39.334809203 +0100

+++ openssh-6.1p1/openbsd-compat/port-linux.c	2012-11-05 14:54:32.614504884 +0100

@@ -505,6 +505,25 @@ ssh_selinux_change_context(const char *n

 	xfree(newctx);

 }

+void

+ssh_selinux_copy_context(void)

+{

+	security_context_t *ctx;

+

+	if (!ssh_selinux_enabled())

+		return;

+

+	if (getexeccon((security_context_t *)&ctx) != 0) {

+		logit("%s: getcon failed with %s", __func__, strerror (errno));

+		return;

+	}

+	if (ctx != NULL) {

+		if (setcon(ctx) != 0)

+			logit("%s: setcon failed with %s", __func__, strerror (errno));

+		freecon(ctx);

+	}

+}

+

 #endif /* WITH_SELINUX */

 #ifdef LINUX_OOM_ADJUST

diff -up openssh-6.1p1/openbsd-compat/port-linux.h.privsep-selinux openssh-6.1p1/openbsd-compat/port-linux.h

--- openssh-6.1p1/openbsd-compat/port-linux.h.privsep-selinux	2011-01-25 02:16:18.000000000 +0100

+++ openssh-6.1p1/openbsd-compat/port-linux.h	2012-11-05 14:46:39.339809234 +0100

@@ -24,6 +24,7 @@ int ssh_selinux_enabled(void);

 void ssh_selinux_setup_pty(char *, const char *);

 void ssh_selinux_setup_exec_context(char *);

 void ssh_selinux_change_context(const char *);

+void ssh_selinux_copy_context(void);

 void ssh_selinux_setfscreatecon(const char *);

 #endif

diff -up openssh-6.1p1/session.c.privsep-selinux openssh-6.1p1/session.c

--- openssh-6.1p1/session.c.privsep-selinux	2012-12-03 09:43:11.727505761 +0100

+++ openssh-6.1p1/session.c	2012-12-03 09:54:50.455688902 +0100

@@ -1519,6 +1519,9 @@ do_setusercontext(struct passwd *pw)

 			    pw->pw_uid);

 			chroot_path = percent_expand(tmp, "h", pw->pw_dir,

 			    "u", pw->pw_name, (char *)NULL);

+#ifdef WITH_SELINUX

+			ssh_selinux_copy_context();

+#endif

 			safely_chroot(chroot_path, pw->pw_uid);

 			free(tmp);

 			free(chroot_path);

@@ -1533,6 +1536,12 @@ do_setusercontext(struct passwd *pw)

 		/* Permanently switch to the desired uid. */

 		permanently_set_uid(pw);

 #endif

+

+#ifdef WITH_SELINUX

+		if (options.chroot_directory == NULL ||

+		    strcasecmp(options.chroot_directory, "none") == 0)

+			ssh_selinux_copy_context();

+#endif

 	}

 	if (getuid() != pw->pw_uid || geteuid() != pw->pw_uid)

@@ -1787,9 +1796,6 @@ do_child(Session *s, const char *command

 		argv[i] = NULL;

 		optind = optreset = 1;

 		__progname = argv[0];

-#ifdef WITH_SELINUX

-		ssh_selinux_change_context("sftpd_t");

-#endif

 		exit(sftp_server_main(i, argv, s->pw));

 	}

diff -up openssh-6.1p1/sshd.c.privsep-selinux openssh-6.1p1/sshd.c

--- openssh-6.1p1/sshd.c.privsep-selinux	2012-11-05 14:46:39.335809209 +0100

+++ openssh-6.1p1/sshd.c	2012-11-05 14:46:39.341809247 +0100

@@ -794,6 +794,13 @@ privsep_postauth(Authctxt *authctxt)

 	do_setusercontext(authctxt->pw);

  skip:

+#ifdef WITH_SELINUX

+	/* switch SELinux content for root too */

+	if (authctxt->pw->pw_uid == 0) {

+		ssh_selinux_copy_context();

+	}

+#endif

+

 	/* It is safe now to apply the key state */

 	monitor_apply_keystate(pmonitor);