tyler.durden/openssh-portable
1
0
Fork 0
mirror of https://github.com/PowerShell/openssh-portable.git synced 2025-07-31 01:35:11 +02:00
Code Issues Packages Projects Releases Wiki Activity

- djm@cvs.openbsd.org 2013/03/06 23:35:23

Browse Source 
[session.c]
     fatal() when ChrootDirectory specified by running without root privileges;
     ok markus@
This commit is contained in:
Damien Miller 2013-04-23 15:16:43 +10:00
parent 62e9c4f9b6
commit 998cc56b65
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -6,6 +6,10 @@
- markus@cvs.openbsd.org 2013/03/05 20:16:09 - markus@cvs.openbsd.org 2013/03/05 20:16:09
[sshconnect2.c] [sshconnect2.c]
reset pubkey order on partial success; ok djm@ reset pubkey order on partial success; ok djm@
- djm@cvs.openbsd.org 2013/03/06 23:35:23
[session.c]
fatal() when ChrootDirectory specified by running without root privileges;
ok markus@
20130418 20130418
- (djm) [config.guess config.sub] Update to last versions before they switch - (djm) [config.guess config.sub] Update to last versions before they switch

6
session.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: session.c,v 1.261 2012/12/02 20:46:11 djm Exp $ */ /* $OpenBSD: session.c,v 1.262 2013/03/06 23:35:23 djm Exp $ */
/* /*
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
* All rights reserved * All rights reserved
@ -1529,7 +1529,9 @@ do_setusercontext(struct passwd *pw)
/* Permanently switch to the desired uid. */ /* Permanently switch to the desired uid. */
permanently_set_uid(pw); permanently_set_uid(pw);
#endif #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) if (getuid() != pw->pw_uid || geteuid() != pw->pw_uid)
fatal("Failed to set uids to %u.", (u_int) pw->pw_uid); fatal("Failed to set uids to %u.", (u_int) pw->pw_uid);