diff options
| author | Damien Miller <djm@mindrot.org> | 2013-04-23 15:22:13 +1000 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2013-04-23 15:22:13 +1000 |
| commit | f1a02aea35504e8bef2ed9eef6f9ddeab12bacb3 (patch) | |
| tree | 2096d603b881a4d900bbd931732ef20148a1e4fe /session.c | |
| parent | d5edefd27a30768cc7a4817302e964b6cb2f9be7 (diff) | |
| download | openssh-git-f1a02aea35504e8bef2ed9eef6f9ddeab12bacb3.tar.gz | |
- dtucker@cvs.openbsd.org 2013/04/17 09:04:09
[session.c]
revert rev 1.262; it fails because uid is already set here. ok djm@
Diffstat (limited to 'session.c')
| -rw-r--r-- | session.c | 6 |
1 files changed, 2 insertions, 4 deletions
@@ -1,4 +1,4 @@ -/* $OpenBSD: session.c,v 1.262 2013/03/06 23:35:23 djm Exp $ */ +/* $OpenBSD: session.c,v 1.263 2013/04/17 09:04:09 dtucker Exp $ */ /* * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland * All rights reserved @@ -1529,9 +1529,7 @@ do_setusercontext(struct passwd *pw) /* Permanently switch to the desired uid. */ permanently_set_uid(pw); #endif - } else if (options.chroot_directory != NULL && - strcasecmp(options.chroot_directory, "none") != 0) - fatal("server lacks privileges to chroot to ChrootDirectory"); + } if (getuid() != pw->pw_uid || geteuid() != pw->pw_uid) fatal("Failed to set uids to %u.", (u_int) pw->pw_uid); |