Attachment 864 Details for Bug 1006 – fix expire message bug in sshd, updated

[patch] fix expire message bug in sshd, updated

openssh-aix-expiremsg.patch (text/plain), 2.82 KB, created by Darren Tucker on 2005-03-31 23:50:55 AEST

(hide)

Description:

Filename:

MIME Type:

Creator: Darren Tucker

Created: 2005-03-31 23:50:55 AEST

Size: 2.82 KB

patch

obsolete

>Index: auth.h
>===================================================================
>RCS file: /usr/local/src/security/openssh/cvs/openssh_cvs/auth.h,v
>retrieving revision 1.65
>diff -u -p -r1.65 auth.h
>--- auth.h	2 Feb 2005 13:20:53 -0000	1.65
>+++ auth.h	30 Mar 2005 04:11:30 -0000
>@@ -30,6 +30,7 @@
> 
> #include "key.h"
> #include "hostfile.h"
>+#include "buffer.h"
> #include <openssl/rsa.h>
> 
> #ifdef HAVE_LOGIN_CAP
>@@ -68,6 +69,7 @@ struct Authctxt {
> 	char		*krb5_ticket_file;
> 	char		*krb5_ccname;
> #endif
>+	Buffer		*loginmsg;
> 	void		*methoddata;
> };
> /*
>@@ -185,6 +187,8 @@ void	 auth_debug_reset(void);
> 
> struct passwd *fakepw(void);
> 
>+int	 sys_auth_passwd(Authctxt *, const char *);
>+
> #define AUTH_FAIL_MSG "Too many authentication failures for %.100s"
> 
> #define SKEY_PROMPT "\nS/Key Password: "
>Index: sshd.c
>===================================================================
>RCS file: /usr/local/src/security/openssh/cvs/openssh_cvs/sshd.c,v
>retrieving revision 1.307
>diff -u -p -r1.307 sshd.c
>--- sshd.c	6 Mar 2005 11:38:52 -0000	1.307
>+++ sshd.c	23 Mar 2005 11:47:25 -0000
>@@ -1673,6 +1673,8 @@ main(int ac, char **av)
> 	authctxt = xmalloc(sizeof(*authctxt));
> 	memset(authctxt, 0, sizeof(*authctxt));
> 
>+	authctxt->loginmsg = &loginmsg;
>+
> 	/* XXX global for cleanup, access from other modules */
> 	the_authctxt = authctxt;
> 
>Index: openbsd-compat/port-aix.c
>===================================================================
>RCS file: /usr/local/src/security/openssh/cvs/openssh_cvs/openbsd-compat/port-aix.c,v
>retrieving revision 1.29
>diff -u -p -r1.29 port-aix.c
>--- openbsd-compat/port-aix.c	16 Feb 2005 11:49:31 -0000	1.29
>+++ openbsd-compat/port-aix.c	23 Mar 2005 11:54:20 -0000
>@@ -151,7 +151,7 @@ aix_valid_authentications(const char *us
>  * returns 0.
>  */
> int
>-sys_auth_passwd(Authctxt *ctxt, const char *password, Buffer *loginmsg)
>+sys_auth_passwd(Authctxt *ctxt, const char *password)
> {
> 	char *authmsg = NULL, *msg, *name = ctxt->pw->pw_name;
> 	int authsuccess = 0, expired, reenter, result;
>@@ -181,7 +181,7 @@ sys_auth_passwd(Authctxt *ctxt, const ch
> 		 */
> 		expired = passwdexpired(name, &msg);
> 		if (msg && *msg) {
>-			buffer_append(loginmsg, msg, strlen(msg));
>+			buffer_append(ctxt->loginmsg, msg, strlen(msg));
> 			aix_remove_embedded_newlines(msg);
> 		}
> 		debug3("AIX/passwdexpired returned %d msg %.100s", expired, msg);
>Index: monitor.c
>===================================================================
>RCS file: /usr/local/src/security/openssh/cvs/openssh_cvs/monitor.c,v
>retrieving revision 1.83
>diff -u -p -r1.83 monitor.c
>--- monitor.c	14 Mar 2005 12:08:12 -0000	1.83
>+++ monitor.c	31 Mar 2005 13:43:20 -0000
>@@ -310,6 +310,8 @@ monitor_child_preauth(Authctxt *_authctx
> 	authctxt = _authctxt;
> 	memset(authctxt, 0, sizeof(*authctxt));
> 
>+	authctxt->loginmsg = &loginmsg;
>+
> 	if (compat20) {
> 		mon_dispatch = mon_dispatch_proto20;
>

Actions: View | Diff

Attachments on bug 1006: 863 | 864