Attachment 141 Details for Bug 355 – Move loginsuccess to auth-passwd.c

[patch] Move loginsuccess to auth-passwd.c

openssh-aixloginsuccess.patch (text/plain), 1.86 KB, created by Darren Tucker on 2002-08-25 21:56:45 AEST

(hide)

Description:

Filename:

MIME Type:

Creator: Darren Tucker

Created: 2002-08-25 21:56:45 AEST

Size: 1.86 KB

patch

obsolete

>Index: auth-passwd.c
>===================================================================
>RCS file: /cvs/openssh/auth-passwd.c,v
>retrieving revision 1.47
>diff -u -r1.47 auth-passwd.c
>--- auth-passwd.c	21 Jun 2002 06:05:13 -0000	1.47
>+++ auth-passwd.c	25 Aug 2002 11:39:01 -0000
>@@ -81,6 +81,9 @@
> #endif /* !USE_PAM && !HAVE_OSF_SIA */
> 
> extern ServerOptions options;
>+#ifdef WITH_AIXAUTHENTICATE
>+extern char *aixloginmsg;
>+#endif
> 
> /*
>  * Tries to authenticate the user using password.  Returns true if
>@@ -113,7 +116,7 @@
> #endif
> #ifdef WITH_AIXAUTHENTICATE
> 	char *authmsg;
>-	char *loginmsg;
>+	int authsuccess;
> 	int reenter = 1;
> #endif
> 
>@@ -145,7 +148,16 @@
> 	}
> #endif
> #ifdef WITH_AIXAUTHENTICATE
>-	return (authenticate(pw->pw_name,password,&reenter,&authmsg) == 0);
>+	authsuccess = (authenticate(pw->pw_name,password,&reenter,&authmsg) == 0);
>+
>+	if (authsuccess)
>+	        /* We don't have a pty yet, so just label the line as "ssh" */
>+	        if (loginsuccess(authctxt->user,
>+			get_canonical_hostname(options.verify_reverse_mapping),
>+			"ssh", &aixloginmsg) < 0)
>+				aixloginmsg = NULL;
>+
>+	return(authsuccess);
> #endif
> #ifdef KRB4
> 	if (options.kerberos_authentication == 1) {
>Index: session.c
>===================================================================
>RCS file: /cvs/openssh/session.c,v
>retrieving revision 1.215
>diff -u -r1.215 session.c
>--- session.c	1 Aug 2002 01:28:39 -0000	1.215
>+++ session.c	25 Aug 2002 11:39:07 -0000
>@@ -210,13 +210,6 @@
> 		close(startup_pipe);
> 		startup_pipe = -1;
> 	}
>-#ifdef WITH_AIXAUTHENTICATE
>-	/* We don't have a pty yet, so just label the line as "ssh" */
>-	if (loginsuccess(authctxt->user,
>-	    get_canonical_hostname(options.verify_reverse_mapping),
>-	    "ssh", &aixloginmsg) < 0)
>-		aixloginmsg = NULL;
>-#endif /* WITH_AIXAUTHENTICATE */
> 
> 	/* setup the channel layer */
> 	if (!no_port_forwarding_flag && options.allow_tcp_forwarding)

Actions: View | Diff

Attachments on bug 355: 140 | 141 | 142