diff options
author | Darren Tucker <dtucker@zip.com.au> | 2010-11-05 13:29:25 +1100 |
---|---|---|
committer | Darren Tucker <dtucker@zip.com.au> | 2010-11-05 13:29:25 +1100 |
commit | 0b2ee6452c6c6e0c37dc10072ec4cf711e8dde89 (patch) | |
tree | 9b48d1d3cfad254cf3be796a1d2f2e263cf3fde7 | |
parent | 676b912e780499e9f59e8add7859a014cb2db07d (diff) | |
download | openssh-git-0b2ee6452c6c6e0c37dc10072ec4cf711e8dde89.tar.gz |
- (dtucker) [platform.c session.c] Move irix setusercontext fragment into
platform.c.
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | platform.c | 7 | ||||
-rw-r--r-- | session.c | 3 |
3 files changed, 9 insertions, 5 deletions
@@ -35,7 +35,9 @@ the LOGIN_CAP case into platform.c. - (dtucker) platform.c session.c] Move the USE_LIBIAF fragment into platform.c - - (dtucker) platform.c session.c] Move aix_usrinfo frament into platform.c. + - (dtucker) [platform.c session.c] Move aix_usrinfo frament into platform.c. + - (dtucker) [platform.c session.c] Move irix setusercontext 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.11 2010/11/05 02:11:04 dtucker Exp $ */ +/* $Id: platform.c,v 1.12 2010/11/05 02:29:25 dtucker Exp $ */ /* * Copyright (c) 2006 Darren Tucker. All rights reserved. @@ -102,6 +102,11 @@ platform_setusercontext(struct passwd *pw) void platform_setusercontext_post_groups(struct passwd *pw) { +#if !defined(HAVE_LOGIN_CAP) && (defined(WITH_IRIX_PROJECT) || \ + defined(WITH_IRIX_JOBS) || defined(WITH_IRIX_ARRAY)) + irix_setusercontext(pw); +#endif /* defined(WITH_IRIX_PROJECT) || defined(WITH_IRIX_JOBS) || defined(WITH_IRIX_ARRAY) */ + #ifdef _AIX aix_usrinfo(pw); #endif /* _AIX */ @@ -1510,9 +1510,6 @@ do_setusercontext(struct passwd *pw) do_pam_setcred(use_privsep); } # endif /* USE_PAM */ -# if defined(WITH_IRIX_PROJECT) || defined(WITH_IRIX_JOBS) || defined(WITH_IRIX_ARRAY) - irix_setusercontext(pw); -# endif /* defined(WITH_IRIX_PROJECT) || defined(WITH_IRIX_JOBS) || defined(WITH_IRIX_ARRAY) */ #endif platform_setusercontext_post_groups(pw); |