diff options
| author | Darren Tucker <dtucker@cvs.openbsd.org> | 2013-04-17 09:04:10 +0000 |
|---|---|---|
| committer | Darren Tucker <dtucker@cvs.openbsd.org> | 2013-04-17 09:04:10 +0000 |
| commit | 2ce0060119199186f806c91f69788c868f46539f (patch) | |
| tree | cc5c6ea419d0defd0c7b719bb3274352ca13d973 /usr.bin | |
| parent | 618ec04a5282fab3adeaaf966579dcabe0d098cf (diff) | |
revert rev 1.262; it fails because uid is already set here. ok djm@
Diffstat (limited to 'usr.bin')
| -rw-r--r-- | usr.bin/ssh/session.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/usr.bin/ssh/session.c b/usr.bin/ssh/session.c index 5bc944093b9..8052f8e58d9 100644 --- a/usr.bin/ssh/session.c +++ b/usr.bin/ssh/session.c @@ -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 @@ -1216,10 +1216,7 @@ do_setusercontext(struct passwd *pw) perror("unable to set user context (setuser)"); exit(1); } - } 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); } |