3 files changed, 6 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index 6595f6768..a6380346b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -35,6 +35,7 @@
    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.
 
 20101025
  - (tim) [openbsd-compat/glob.h] Remove sys/cdefs.h include that came with
diff --git a/platform.c b/platform.c
index 910e39713..97439b574 100644
--- a/platform.c
+++ b/platform.c
@@ -1,4 +1,4 @@
-/* $Id: platform.c,v 1.10 2010/11/05 02:07:25 dtucker Exp $ */
+/* $Id: platform.c,v 1.11 2010/11/05 02:11:04 dtucker Exp $ */
 
 /*
  * Copyright (c) 2006 Darren Tucker.  All rights reserved.
@@ -102,6 +102,10 @@ platform_setusercontext(struct passwd *pw)
 void
 platform_setusercontext_post_groups(struct passwd *pw)
 {
+#ifdef _AIX
+        aix_usrinfo(pw);
+#endif /* _AIX */
+
 #if !defined(HAVE_LOGIN_CAP) && defined(USE_LIBIAF)
         if (set_id(pw->pw_name) != 0) {
                 exit(1);
diff --git a/session.c b/session.c
index 6ef07c407..fc712ad93 100644
--- a/session.c
+++ b/session.c
@@ -1513,9 +1513,6 @@ do_setusercontext(struct passwd *pw)
 # 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) */
-# ifdef _AIX
-                aix_usrinfo(pw);
-# endif /* _AIX */
 #endif
 
                 platform_setusercontext_post_groups(pw);