diff options
author | Darren Tucker <dtucker@zip.com.au> | 2010-11-05 12:45:18 +1100 |
---|---|---|
committer | Darren Tucker <dtucker@zip.com.au> | 2010-11-05 12:45:18 +1100 |
commit | 44a97be0cc3ede56663b94548806465d2b090461 (patch) | |
tree | d6b41c2812b4a6efd78cea3bdf37c2c44e463569 | |
parent | 4db380701d15727e43600e41a567d36177e4226e (diff) | |
download | openssh-git-44a97be0cc3ede56663b94548806465d2b090461.tar.gz |
- (dtucker) [platform.c session.c] Move the BSDI setpgrp into platform.c.
-rw-r--r-- | ChangeLog | 1 | ||||
-rw-r--r-- | platform.c | 6 | ||||
-rw-r--r-- | session.c | 3 |
3 files changed, 6 insertions, 4 deletions
@@ -28,6 +28,7 @@ after the user's groups are established and move the selinux calls into it. - (dtucker) [platform.c session.c] Move the AIX setpcred+chroot hack into platform.c + - (dtucker) [platform.c session.c] Move the BSDI setpgrp into platform.c. 20101025 - (tim) [openbsd-compat/glob.h] Remove sys/cdefs.h include that came with @@ -1,4 +1,4 @@ -/* $Id: platform.c,v 1.6 2010/11/05 01:41:13 dtucker Exp $ */ +/* $Id: platform.c,v 1.7 2010/11/05 01:45:18 dtucker Exp $ */ /* * Copyright (c) 2006 Darren Tucker. All rights reserved. @@ -74,6 +74,10 @@ platform_setusercontext(struct passwd *pw) if (getuid() == 0 || geteuid() == 0) solaris_set_default_project(pw); #endif + +#if defined(HAVE_LOGIN_CAP) && defined (__bsdi__) + setpgid(0, 0); +# endif } /* @@ -1476,9 +1476,6 @@ do_setusercontext(struct passwd *pw) #endif /* HAVE_CYGWIN */ { #ifdef HAVE_LOGIN_CAP -# ifdef __bsdi__ - setpgid(0, 0); -# endif # ifdef USE_PAM if (options.use_pam) { do_pam_setcred(use_privsep); |