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) |
- (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 @@ | |||
28 | after the user's groups are established and move the selinux calls into it. | 28 | after the user's groups are established and move the selinux calls into it. |
29 | - (dtucker) [platform.c session.c] Move the AIX setpcred+chroot hack into | 29 | - (dtucker) [platform.c session.c] Move the AIX setpcred+chroot hack into |
30 | platform.c | 30 | platform.c |
31 | - (dtucker) [platform.c session.c] Move the BSDI setpgrp into platform.c. | ||
31 | 32 | ||
32 | 20101025 | 33 | 20101025 |
33 | - (tim) [openbsd-compat/glob.h] Remove sys/cdefs.h include that came with | 34 | - (tim) [openbsd-compat/glob.h] Remove sys/cdefs.h include that came with |
diff --git a/platform.c b/platform.c index 1604f8b59..20b478343 100644 --- a/platform.c +++ b/platform.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: platform.c,v 1.6 2010/11/05 01:41:13 dtucker Exp $ */ | 1 | /* $Id: platform.c,v 1.7 2010/11/05 01:45:18 dtucker Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * Copyright (c) 2006 Darren Tucker. All rights reserved. | 4 | * Copyright (c) 2006 Darren Tucker. All rights reserved. |
@@ -74,6 +74,10 @@ platform_setusercontext(struct passwd *pw) | |||
74 | if (getuid() == 0 || geteuid() == 0) | 74 | if (getuid() == 0 || geteuid() == 0) |
75 | solaris_set_default_project(pw); | 75 | solaris_set_default_project(pw); |
76 | #endif | 76 | #endif |
77 | |||
78 | #if defined(HAVE_LOGIN_CAP) && defined (__bsdi__) | ||
79 | setpgid(0, 0); | ||
80 | # endif | ||
77 | } | 81 | } |
78 | 82 | ||
79 | /* | 83 | /* |
@@ -1476,9 +1476,6 @@ do_setusercontext(struct passwd *pw) | |||
1476 | #endif /* HAVE_CYGWIN */ | 1476 | #endif /* HAVE_CYGWIN */ |
1477 | { | 1477 | { |
1478 | #ifdef HAVE_LOGIN_CAP | 1478 | #ifdef HAVE_LOGIN_CAP |
1479 | # ifdef __bsdi__ | ||
1480 | setpgid(0, 0); | ||
1481 | # endif | ||
1482 | # ifdef USE_PAM | 1479 | # ifdef USE_PAM |
1483 | if (options.use_pam) { | 1480 | if (options.use_pam) { |
1484 | do_pam_setcred(use_privsep); | 1481 | do_pam_setcred(use_privsep); |