openssh-SNAP-20001016

[Damien Miller]

On Fri, 27 Oct 2000, Gert Doering wrote:

> Unfortunately, compilation then fails in auth2.c, because "user" is
> not defined here:

Sorry about this, the AIX stuff was mangled by the recent auth cleanup.

Does this help?

Index: auth2.c
===================================================================
RCS file: /var/cvs/openssh/auth2.c,v
retrieving revision 1.18
diff -u -r1.18 auth2.c
--- auth2.c	2000/10/16 01:14:42	1.18
+++ auth2.c	2000/10/28 02:34:37
@@ -193,7 +193,7 @@
 		fatal("input_userauth_request: no authctxt");
 	if (authctxt->attempt++ >= AUTH_FAIL_MAX) {
 #ifdef WITH_AIXAUTHENTICATE 
-		loginfailed(user,get_canonical_hostname(),"ssh");
+		loginfailed(authctxt->pw->pw_name, get_canonical_hostname(), "ssh");
 #endif /* WITH_AIXAUTHENTICATE */
 		packet_disconnect("too many failed userauth_requests");
 	}
@@ -306,8 +306,8 @@
 	if (authenticated == 1) {
 #ifdef WITH_AIXAUTHENTICATE
 		/* We don't have a pty yet, so just label the line as "ssh" */
-		if (loginsuccess(user, get_canonical_hostname(), "ssh",
-				&aixloginmsg) < 0)
+		if (loginsuccess(authctxt->pw->pw_name, get_canonical_hostname(), 
+			"ssh", &aixloginmsg) < 0)
 			aixloginmsg = NULL;
 #endif /* WITH_AIXAUTHENTICATE */
 		/* turn off userauth */


-- 
| ``We've all heard that a million monkeys banging on | Damien Miller -
| a million typewriters will eventually reproduce the | <djm at mindrot.org>
| works of Shakespeare. Now, thanks to the Internet, / 
| we know this is not true.'' - Robert Wilensky UCB / http://www.mindrot.org