diff options
-rw-r--r-- | ChangeLog | 2 | ||||
-rw-r--r-- | platform.c | 8 | ||||
-rw-r--r-- | session.c | 5 |
3 files changed, 9 insertions, 6 deletions
@@ -33,6 +33,8 @@ | |||
33 | retain previous behavior. | 33 | retain previous behavior. |
34 | - (dtucker) [platform.c session.c] Move the PAM credential establishment for | 34 | - (dtucker) [platform.c session.c] Move the PAM credential establishment for |
35 | the LOGIN_CAP case into platform.c. | 35 | the LOGIN_CAP case into platform.c. |
36 | - (dtucker) platform.c session.c] Move the USE_LIBIAF fragment into | ||
37 | platform.c | ||
36 | 38 | ||
37 | 20101025 | 39 | 20101025 |
38 | - (tim) [openbsd-compat/glob.h] Remove sys/cdefs.h include that came with | 40 | - (tim) [openbsd-compat/glob.h] Remove sys/cdefs.h include that came with |
diff --git a/platform.c b/platform.c index 0335eaae6..910e39713 100644 --- a/platform.c +++ b/platform.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: platform.c,v 1.9 2010/11/05 02:00:05 dtucker Exp $ */ | 1 | /* $Id: platform.c,v 1.10 2010/11/05 02:07:25 dtucker Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * Copyright (c) 2006 Darren Tucker. All rights reserved. | 4 | * Copyright (c) 2006 Darren Tucker. All rights reserved. |
@@ -102,6 +102,12 @@ platform_setusercontext(struct passwd *pw) | |||
102 | void | 102 | void |
103 | platform_setusercontext_post_groups(struct passwd *pw) | 103 | platform_setusercontext_post_groups(struct passwd *pw) |
104 | { | 104 | { |
105 | #if !defined(HAVE_LOGIN_CAP) && defined(USE_LIBIAF) | ||
106 | if (set_id(pw->pw_name) != 0) { | ||
107 | exit(1); | ||
108 | } | ||
109 | # endif /* USE_LIBIAF */ | ||
110 | |||
105 | #ifdef HAVE_SETPCRED | 111 | #ifdef HAVE_SETPCRED |
106 | /* | 112 | /* |
107 | * If we have a chroot directory, we set all creds except real | 113 | * If we have a chroot directory, we set all creds except real |
@@ -1516,11 +1516,6 @@ do_setusercontext(struct passwd *pw) | |||
1516 | # ifdef _AIX | 1516 | # ifdef _AIX |
1517 | aix_usrinfo(pw); | 1517 | aix_usrinfo(pw); |
1518 | # endif /* _AIX */ | 1518 | # endif /* _AIX */ |
1519 | # ifdef USE_LIBIAF | ||
1520 | if (set_id(pw->pw_name) != 0) { | ||
1521 | exit(1); | ||
1522 | } | ||
1523 | # endif /* USE_LIBIAF */ | ||
1524 | #endif | 1519 | #endif |
1525 | 1520 | ||
1526 | platform_setusercontext_post_groups(pw); | 1521 | platform_setusercontext_post_groups(pw); |