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

- (tim) [openssh/session.c] Work around to get chroot sftp working on UnixWare

Browse Source
This commit is contained in:
Tim Rice 2014-06-18 16:17:28 -07:00
parent 316fac6f18
commit a261b8df59
2 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -1,3 +1,6 @@
20140618
- (tim) [openssh/session.c] Work around to get chroot sftp working on UnixWare
20140617 20140617
- (dtucker) [entropy.c openbsd-compat/openssl-compat.{c,h} - (dtucker) [entropy.c openbsd-compat/openssl-compat.{c,h}
openbsd-compat/regress/{.cvsignore,Makefile.in,opensslvertest.c}] openbsd-compat/regress/{.cvsignore,Makefile.in,opensslvertest.c}]

15
session.c
View File

@ -1505,6 +1505,9 @@ void
do_setusercontext(struct passwd *pw) do_setusercontext(struct passwd *pw)
{ {
char *chroot_path, *tmp; char *chroot_path, *tmp;
#ifdef USE_LIBIAF
int doing_chroot = 0;
#endif
platform_setusercontext(pw); platform_setusercontext(pw);
@ -1544,6 +1547,9 @@ do_setusercontext(struct passwd *pw)
/* Make sure we don't attempt to chroot again */ /* Make sure we don't attempt to chroot again */
free(options.chroot_directory); free(options.chroot_directory);
options.chroot_directory = NULL; options.chroot_directory = NULL;
#ifdef USE_LIBIAF
doing_chroot = 1;
#endif
} }
#ifdef HAVE_LOGIN_CAP #ifdef HAVE_LOGIN_CAP
@ -1558,7 +1564,14 @@ do_setusercontext(struct passwd *pw)
(void) setusercontext(lc, pw, pw->pw_uid, LOGIN_SETUMASK); (void) setusercontext(lc, pw, pw->pw_uid, LOGIN_SETUMASK);
#else #else
# ifdef USE_LIBIAF # ifdef USE_LIBIAF
if (set_id(pw->pw_name) != 0) { /* In a chroot environment, the set_id() will always fail; typically
* because of the lack of necessary authentication services and runtime
* such as ./usr/lib/libiaf.so, ./usr/lib/libpam.so.1, and ./etc/passwd
* We skip it in the internal sftp chroot case.
* We'll lose auditing and ACLs but permanently_set_uid will
* take care of the rest.
*/
if ((doing_chroot == 0) && set_id(pw->pw_name) != 0) {
fatal("set_id(%s) Failed", pw->pw_name); fatal("set_id(%s) Failed", pw->pw_name);
} }
# endif /* USE_LIBIAF */ # endif /* USE_LIBIAF */