From 127398c6ec7b306839488df3a8a681dfa711dddd Mon Sep 17 00:00:00 2001
From: Ben Lindstrom <mouring@eviladmin.org>
Date: Sun, 24 Feb 2002 20:25:46 +0000
Subject: [PATCH]  - (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    coming).

---
 ChangeLog                 |  9 +++++++--
 openbsd-compat/port-aix.c | 18 +++++++++++-------
 openbsd-compat/port-aix.h |  2 +-
 3 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index f1e396784..db5bb5341 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
+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
+   coming).
+
 20020221
- - (bal) Minor session.c for cygwin.  mispelt 'is_winnt' variable.
+ - (bal) Minor session.c fixup for cygwin.  mispelt 'is_winnt' variable.
 
 20020219
  - (djm) OpenBSD CVS Sync
@@ -7656,4 +7661,4 @@
  - Wrote replacements for strlcpy and mkdtemp
  - Released 1.0pre1
 
-$Id: ChangeLog,v 1.1870 2002/02/21 15:37:02 mouring Exp $
+$Id: ChangeLog,v 1.1871 2002/02/24 20:25:46 mouring Exp $
diff --git a/openbsd-compat/port-aix.c b/openbsd-compat/port-aix.c
index 245c8a509..31697d7de 100644
--- a/openbsd-compat/port-aix.c
+++ b/openbsd-compat/port-aix.c
@@ -2,7 +2,12 @@
 
 #ifdef _AIX
 
+#ifdef HAVE_USERSEC_H
+#include <usersec.h>
+#endif /* HAVE_USERSEC_H */
+
 #include <uinfo.h>
+#include <../xmalloc.h>
 
 /* AIX limits */
 #if defined(HAVE_GETUSERATTR) && !defined(S_UFSIZE_HARD) && defined(S_UFSIZE)
@@ -101,17 +106,16 @@ set_limits_from_userattr(char *user)
  * actually use this and die if it's not set
  */
 void
-aix_usrinfo(Session *s) 
+aix_usrinfo(struct passwd *pw, char *tty, int ttyfd) 
 {
-	struct passwd *pw = s->pw;
 	u_int i;
-	const char *cp=NULL;
+	char *cp=NULL;
 
-	if (s->ttyfd == -1)
-		s->tty[0] = '\0';
-	cp = xmalloc(22 + strlen(s->tty) + 2 * strlen(pw->pw_name));
+	if (ttyfd == -1)
+		tty[0] = '\0';
+	cp = xmalloc(22 + strlen(tty) + 2 * strlen(pw->pw_name));
 	i = sprintf(cp, "LOGNAME=%s%cNAME=%s%cTTY=%s%c%c", pw->pw_name, 0, 
-	    pw->pw_name, 0, s->tty, 0, 0);
+	    pw->pw_name, 0, tty, 0, 0);
 	if (usrinfo(SETUINFO, cp, i) == -1)
 		fatal("Couldn't set usrinfo: %s", strerror(errno));
 	debug3("AIX/UsrInfo: set len %d", i);
diff --git a/openbsd-compat/port-aix.h b/openbsd-compat/port-aix.h
index 891b27add..b5647e7ab 100644
--- 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(Session *s);
+void aix_usrinfo(struct passwd *pw, char *tty, int ttyfd)
 
 #endif /* _AIX */