diff options
author | Darren Tucker <dtucker@zip.com.au> | 2010-11-05 13:07:24 +1100 |
---|---|---|
committer | Darren Tucker <dtucker@zip.com.au> | 2010-11-05 13:07:24 +1100 |
commit | 7a8afe3186bd2007da3a2fce4276e5b96ed877f6 (patch) | |
tree | 5664b7ee8cb685f51f4af5084a7b9f8ea299d411 | |
parent | 728d8371a1dc1b615284ece94b0085897b4c0b51 (diff) | |
download | openssh-git-7a8afe3186bd2007da3a2fce4276e5b96ed877f6.tar.gz |
- (dtucker) platform.c session.c] Move the USE_LIBIAF fragment into
platform.c
-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 @@ retain previous behavior. - (dtucker) [platform.c session.c] Move the PAM credential establishment for the LOGIN_CAP case into platform.c. + - (dtucker) platform.c session.c] Move the USE_LIBIAF fragment 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.9 2010/11/05 02:00:05 dtucker Exp $ */ +/* $Id: platform.c,v 1.10 2010/11/05 02:07:25 dtucker Exp $ */ /* * Copyright (c) 2006 Darren Tucker. All rights reserved. @@ -102,6 +102,12 @@ platform_setusercontext(struct passwd *pw) void platform_setusercontext_post_groups(struct passwd *pw) { +#if !defined(HAVE_LOGIN_CAP) && defined(USE_LIBIAF) + if (set_id(pw->pw_name) != 0) { + exit(1); + } +# endif /* USE_LIBIAF */ + #ifdef HAVE_SETPCRED /* * If we have a chroot directory, we set all creds except real @@ -1516,11 +1516,6 @@ do_setusercontext(struct passwd *pw) # ifdef _AIX aix_usrinfo(pw); # endif /* _AIX */ -# ifdef USE_LIBIAF - if (set_id(pw->pw_name) != 0) { - exit(1); - } -# endif /* USE_LIBIAF */ #endif platform_setusercontext_post_groups(pw); |