Attachment #141 for bug #355

Lines 81-86 Link Here

(-)auth-passwd.c (-2 / +14 lines)
81	#endif /* !USE_PAM && !HAVE_OSF_SIA */	81	#endif /* !USE_PAM && !HAVE_OSF_SIA */
82		82
83	extern ServerOptions options;	83	extern ServerOptions options;
		84	#ifdef WITH_AIXAUTHENTICATE
		85	extern char *aixloginmsg;
		86	#endif
84		87
85	/*	88	/*
86	* Tries to authenticate the user using password. Returns true if	89	* Tries to authenticate the user using password. Returns true if
Lines 113-119 Link Here
113	#endif	116	#endif
114	#ifdef WITH_AIXAUTHENTICATE	117	#ifdef WITH_AIXAUTHENTICATE
115	char *authmsg;	118	char *authmsg;
116	char *loginmsg;	119	int authsuccess;
117	int reenter = 1;	120	int reenter = 1;
118	#endif	121	#endif
119		122
Lines 145-151 Link Here
145	}	148	}
146	#endif	149	#endif
147	#ifdef WITH_AIXAUTHENTICATE	150	#ifdef WITH_AIXAUTHENTICATE
148	return (authenticate(pw->pw_name,password,&reenter,&authmsg) == 0);	151	authsuccess = (authenticate(pw->pw_name,password,&reenter,&authmsg) == 0);
		152
		153	if (authsuccess)
		154	/* We don't have a pty yet, so just label the line as "ssh" */
		155	if (loginsuccess(authctxt->user,
		156	get_canonical_hostname(options.verify_reverse_mapping),
		157	"ssh", &aixloginmsg) < 0)
		158	aixloginmsg = NULL;
		159
		160	return(authsuccess);
149	#endif	161	#endif
150	#ifdef KRB4	162	#ifdef KRB4
151	if (options.kerberos_authentication == 1) {	163	if (options.kerberos_authentication == 1) {




		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)

Return to bug 355

Lines 210-222 Link Here

(-)session.c (-7 lines)
210	close(startup_pipe);	210	close(startup_pipe);
211	startup_pipe = -1;	211	startup_pipe = -1;
212	}	212	}
213	#ifdef WITH_AIXAUTHENTICATE
214	/* We don't have a pty yet, so just label the line as "ssh" */
215	if (loginsuccess(authctxt->user,
216	get_canonical_hostname(options.verify_reverse_mapping),
217	"ssh", &aixloginmsg) < 0)
218	aixloginmsg = NULL;
219	#endif /* WITH_AIXAUTHENTICATE */
220		213
221	/* setup the channel layer */	214	/* setup the channel layer */
222	if (!no_port_forwarding_flag && options.allow_tcp_forwarding)	215	if (!no_port_forwarding_flag && options.allow_tcp_forwarding)