- (bal) Last AIX patch. Moved aix_usrinfo() outside of do_setuserconext()

   since we need more session information than provided by that function.

diff --git a/ChangeLog b/ChangeLog
index 259d32aab204074319558dfad726edeede3d6390..32db9593e81883a15c41f7ffcfcf4778a155a377 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+20020225
+ - (bal) Last AIX patch.  Moved aix_usrinfo() outside of do_setuserconext()
+   since we need more session information than provided by that function.
+
 20020224
  - (bal) Drop Session *s usage in ports-aix.[ch] and pass just what we
    need to do the jobs (AIX still does not fully compile, but that is

diff --git a/openbsd-compat/port-aix.h b/openbsd-compat/port-aix.h
index b5647e7ab0da8957706579b5b08632699ee9fbc6..29d2ee6301199085390ebc1ae06e11aae94d8c24 100644 (file)
--- a/openbsd-compat/port-aix.h
+++ b/openbsd-compat/port-aix.h
@@ -5,6 +5,6 @@ void set_limit(char *user, char *soft, char *hard, int resource, int mult);
 void set_limits_from_userattr(char *user);
 #endif /* HAVE_GETUSERATTR */
 
-void aix_usrinfo(struct passwd *pw, char *tty, int ttyfd)
+void aix_usrinfo(struct passwd *pw, char *tty, int ttyfd);
 
 #endif /* _AIX */

diff --git a/session.c b/session.c
index bf1a3ecf721c75c96fe9e99fba9ca845d9da0607..a31ff85d84929e984a906202318af106a5816220 100644 (file)
--- a/session.c
+++ b/session.c
@@ -1146,9 +1146,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(s)
-#endif
                /* Permanently switch to the desired uid. */
                permanently_set_uid(pw);
 #endif
@@ -1190,6 +1187,9 @@ do_child(Session *s, const char *command)
                        do_motd();
 #else /* HAVE_OSF_SIA */
                do_nologin(pw);
+# ifdef _AIX
+               aix_usrinfo(pw, s->tty, s->ttyfd);
+# endif /* _AIX */
                do_setusercontext(pw);
 #endif /* HAVE_OSF_SIA */
        }