diff options
author | des <des@FreeBSD.org> | 2010-04-28 10:36:33 +0000 |
---|---|---|
committer | des <des@FreeBSD.org> | 2010-04-28 10:36:33 +0000 |
commit | fc607a2e80dfeb125ae2fe83191d934929997047 (patch) | |
tree | bd00e72572bcfba5ac7d243462c79d29a987c5a2 /crypto/openssh/session.c | |
parent | c86e821ecb2a324088edbbb87198b4d55833575a (diff) | |
download | FreeBSD-src-fc607a2e80dfeb125ae2fe83191d934929997047.zip FreeBSD-src-fc607a2e80dfeb125ae2fe83191d934929997047.tar.gz |
Upgrade to OpenSSH 5.5p1.
Diffstat (limited to 'crypto/openssh/session.c')
-rw-r--r-- | crypto/openssh/session.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/crypto/openssh/session.c b/crypto/openssh/session.c index aad0979..c11a68a 100644 --- a/crypto/openssh/session.c +++ b/crypto/openssh/session.c @@ -1581,6 +1581,10 @@ do_setusercontext(struct passwd *pw) } #endif /* HAVE_SETPCRED */ +#ifdef WITH_SELINUX + ssh_selinux_setup_exec_context(pw->pw_name); +#endif + if (options.chroot_directory != NULL && strcasecmp(options.chroot_directory, "none") != 0) { tmp = tilde_expand_filename(options.chroot_directory, @@ -1605,10 +1609,6 @@ do_setusercontext(struct passwd *pw) if (getuid() != pw->pw_uid || geteuid() != pw->pw_uid) fatal("Failed to set uids to %u.", (u_int) pw->pw_uid); - -#ifdef WITH_SELINUX - ssh_selinux_setup_exec_context(pw->pw_name); -#endif } static void |