From e1bd29bc9edfdb6ec313c1d304cfce0b3f3823d6 Mon Sep 17 00:00:00 2001
From: Ben Lindstrom <mouring@eviladmin.org>
Date: Wed, 21 Feb 2001 20:00:28 +0000
Subject: [PATCH]  - (bal) Corrected SCO luid patch by svaughan
 <svaughan@asterion.com>

---
 ChangeLog |  5 ++++-
 session.c | 12 ++++++------
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index f1bf2250a..ddf30a0e9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+20010222                                                             
+ - (bal) Corrected SCO luid patch by svaughan <svaughan@asterion.com>
+
 20010221
  - (bal) Removed -L/usr/ucblib -R/usr/ucblib for Solaris platform.
  - (bal) Fixed OpenSSL rework to use $saved_*.  Patch by Tim Rice 
@@ -4090,4 +4093,4 @@
  - Wrote replacements for strlcpy and mkdtemp
  - Released 1.0pre1
 
-$Id: ChangeLog,v 1.809 2001/02/21 16:36:51 stevesk Exp $
+$Id: ChangeLog,v 1.810 2001/02/21 20:00:28 mouring Exp $
diff --git a/session.c b/session.c
index d771edb7a..01442aa9e 100644
--- a/session.c
+++ b/session.c
@@ -1080,6 +1080,12 @@ do_child(const char *command, struct passwd * pw, const char *term,
 			}
 #endif
 # else /* HAVE_LOGIN_CAP */
+#if defined(HAVE_GETLUID) && defined(HAVE_SETLUID)
+			/* Sets login uid for accounting */
+			if (getluid() == -1 && setluid(pw->pw_uid) == -1)
+				error("setluid: %s", strerror(errno));
+#endif /* defined(HAVE_GETLUID) && defined(HAVE_SETLUID) */
+
 			if (setlogin(pw->pw_name) < 0)
 				error("setlogin failed: %s", strerror(errno));
 			if (setgid(pw->pw_gid) < 0) {
@@ -1131,12 +1137,6 @@ do_child(const char *command, struct passwd * pw, const char *term,
 		}
 #endif /* HAVE_OSF_SIA */
 
-#if defined(HAVE_GETLUID) && defined(HAVE_SETLUID)
-	/* Sets login uid for accounting */
-	if (getluid() == -1 && setluid(pw->pw_uid) == -1)
-		error("setluid: %s", strerror(errno));
-#endif /* defined(HAVE_GETLUID) && defined(HAVE_SETLUID) */
-
 #ifdef HAVE_CYGWIN
 		if (is_winnt)
 #endif