Attachment #864 for bug #1006

Lines 30-35 Link Here

(-)auth.h (+4 lines)
30		30
31	#include "key.h"	31	#include "key.h"
32	#include "hostfile.h"	32	#include "hostfile.h"
		33	#include "buffer.h"
33	#include <openssl/rsa.h>	34	#include <openssl/rsa.h>
34		35
35	#ifdef HAVE_LOGIN_CAP	36	#ifdef HAVE_LOGIN_CAP
Lines 68-73 struct Authctxt { Link Here
68	char *krb5_ticket_file;	69	char *krb5_ticket_file;
69	char *krb5_ccname;	70	char *krb5_ccname;
70	#endif	71	#endif
		72	Buffer *loginmsg;
71	void *methoddata;	73	void *methoddata;
72	};	74	};
73	/*	75	/*
Lines 185-190 void auth_debug_reset(void); Link Here
185		187
186	struct passwd *fakepw(void);	188	struct passwd *fakepw(void);
187		189
		190	int sys_auth_passwd(Authctxt , const char );
		191
188	#define AUTH_FAIL_MSG "Too many authentication failures for %.100s"	192	#define AUTH_FAIL_MSG "Too many authentication failures for %.100s"
189		193
190	#define SKEY_PROMPT "\nS/Key Password: "	194	#define SKEY_PROMPT "\nS/Key Password: "

Lines 1673-1678 main(int ac, char **av) Link Here

(-)sshd.c (+2 lines)
1673	authctxt = xmalloc(sizeof(*authctxt));	1673	authctxt = xmalloc(sizeof(*authctxt));
1674	memset(authctxt, 0, sizeof(*authctxt));	1674	memset(authctxt, 0, sizeof(*authctxt));
1675		1675
		1676	authctxt->loginmsg = &loginmsg;
		1677
1676	/* XXX global for cleanup, access from other modules */	1678	/* XXX global for cleanup, access from other modules */
1677	the_authctxt = authctxt;	1679	the_authctxt = authctxt;
1678		1680

Lines 151-157 aix_valid_authentications(const char *us Link Here

(-)openbsd-compat/port-aix.c (-2 / +2 lines)
151	* returns 0.	151	* returns 0.
152	*/	152	*/
153	int	153	int
154	sys_auth_passwd(Authctxt ctxt, const char password, Buffer *loginmsg)	154	sys_auth_passwd(Authctxt ctxt, const char password)
155	{	155	{
156	char authmsg = NULL, msg, *name = ctxt->pw->pw_name;	156	char authmsg = NULL, msg, *name = ctxt->pw->pw_name;
157	int authsuccess = 0, expired, reenter, result;	157	int authsuccess = 0, expired, reenter, result;
Lines 181-187 sys_auth_passwd(Authctxt *ctxt, const ch Link Here
181	*/	181	*/
182	expired = passwdexpired(name, &msg);	182	expired = passwdexpired(name, &msg);
183	if (msg && *msg) {	183	if (msg && *msg) {
184	buffer_append(loginmsg, msg, strlen(msg));	184	buffer_append(ctxt->loginmsg, msg, strlen(msg));
185	aix_remove_embedded_newlines(msg);	185	aix_remove_embedded_newlines(msg);
186	}	186	}
187	debug3("AIX/passwdexpired returned %d msg %.100s", expired, msg);	187	debug3("AIX/passwdexpired returned %d msg %.100s", expired, msg);

Lines 310-315 monitor_child_preauth(Authctxt *_authctx Link Here

(-)monitor.c (+2 lines)
310	authctxt = _authctxt;	310	authctxt = _authctxt;
311	memset(authctxt, 0, sizeof(*authctxt));	311	memset(authctxt, 0, sizeof(*authctxt));
312		312
		313	authctxt->loginmsg = &loginmsg;
		314
313	if (compat20) {	315	if (compat20) {
314	mon_dispatch = mon_dispatch_proto20;	316	mon_dispatch = mon_dispatch_proto20;
315		317

Return to bug 1006