Attachment 568 Details for Bug 808 – referenced patch

[patch] referenced patch

force_changepw-segfault.patch (text/plain), 2.96 KB, created by Buck Huppmann on 2004-03-05 08:06:17 AEDT

(hide)

Description:

Filename:

MIME Type:

Creator: Buck Huppmann

Created: 2004-03-05 08:06:17 AEDT

Size: 2.96 KB

patch

obsolete

>diff -ur openssh-3.8p1/auth-pam.c openssh-3.8p1.new/auth-pam.c
>--- openssh-3.8p1/auth-pam.c	Tue Mar  2 15:51:19 2004
>+++ openssh-3.8p1.new/auth-pam.c	Tue Mar  2 15:55:39 2004
>@@ -680,13 +680,14 @@
>  * This replaces auth-pam.c
>  */
> void
>-start_pam(const char *user)
>+start_pam(const char *user, Authctxt *authctxt)
> {
> 	if (!options.use_pam)
> 		fatal("PAM: initialisation requested when UsePAM=no");
> 
> 	if (sshpam_init(user) == -1)
> 		fatal("PAM: initialisation failed");
>+	force_pwchange = &authctxt->force_pwchange;
> }
> 
> void
>diff -ur openssh-3.8p1/auth-pam.h openssh-3.8p1.new/auth-pam.h
>--- openssh-3.8p1/auth-pam.h	Mon Feb  9 21:23:29 2004
>+++ openssh-3.8p1.new/auth-pam.h	Tue Mar  2 15:19:27 2004
>@@ -31,7 +31,7 @@
> # define SSHD_PAM_SERVICE		__progname
> #endif
> 
>-void start_pam(const char *);
>+void start_pam(const char *, Authctxt *);
> void finish_pam(void);
> u_int do_pam_account(void);
> void do_pam_session(void);
>diff -ur openssh-3.8p1/auth1.c openssh-3.8p1.new/auth1.c
>--- openssh-3.8p1/auth1.c	Fri Nov 21 22:15:30 2003
>+++ openssh-3.8p1.new/auth1.c	Tue Mar  2 15:19:12 2004
>@@ -307,7 +307,7 @@
> 
> #ifdef USE_PAM
> 	if (options.use_pam)
>-		PRIVSEP(start_pam(user));
>+		PRIVSEP(start_pam(user, authctxt));
> #endif
> 
> 	/*
>diff -ur openssh-3.8p1/auth2.c openssh-3.8p1.new/auth2.c
>--- openssh-3.8p1/auth2.c	Tue Mar  2 15:51:19 2004
>+++ openssh-3.8p1.new/auth2.c	Tue Mar  2 15:18:25 2004
>@@ -157,14 +157,14 @@
> 			debug2("input_userauth_request: setting up authctxt for %s", user);
> #ifdef USE_PAM
> 			if (options.use_pam)
>-				PRIVSEP(start_pam(authctxt->pw->pw_name));
>+				PRIVSEP(start_pam(authctxt->pw->pw_name, authctxt));
> #endif
> 		} else {
> 			logit("input_userauth_request: illegal user %s", user);
> 			authctxt->pw = fakepw();
> #ifdef USE_PAM
> 			if (options.use_pam)
>-				PRIVSEP(start_pam(user));
>+				PRIVSEP(start_pam(user, authctxt));
> #endif
> 		}
> 		setproctitle("%s%s", authctxt->pw ? user : "unknown",
>diff -ur openssh-3.8p1/monitor.c openssh-3.8p1.new/monitor.c
>--- openssh-3.8p1/monitor.c	Fri Feb  6 00:40:27 2004
>+++ openssh-3.8p1.new/monitor.c	Tue Mar  2 15:22:54 2004
>@@ -789,7 +789,7 @@
> 
> 	user = buffer_get_string(m, NULL);
> 
>-	start_pam(user);
>+	start_pam(user, authctxt);
> 
> 	xfree(user);
> 
>diff -ur openssh-3.8p1/monitor_wrap.c openssh-3.8p1.new/monitor_wrap.c
>--- openssh-3.8p1/monitor_wrap.c	Fri Nov 21 07:56:47 2003
>+++ openssh-3.8p1.new/monitor_wrap.c	Tue Mar  2 15:20:18 2004
>@@ -686,7 +686,7 @@
> 
> #ifdef USE_PAM
> void
>-mm_start_pam(char *user)
>+mm_start_pam(char *user, struct Authctxt *authctxt)
> {
> 	Buffer m;
> 
>diff -ur openssh-3.8p1/monitor_wrap.h openssh-3.8p1.new/monitor_wrap.h
>--- openssh-3.8p1/monitor_wrap.h	Mon Nov 17 06:18:22 2003
>+++ openssh-3.8p1.new/monitor_wrap.h	Tue Mar  2 15:20:55 2004
>@@ -66,7 +66,7 @@
> #endif
> 
> #ifdef USE_PAM
>-void mm_start_pam(char *);
>+void mm_start_pam(char *, struct Authctxt *authctxt);
> u_int mm_do_pam_account(void);
> void *mm_sshpam_init_ctx(struct Authctxt *);
> int mm_sshpam_query(void *, char **, char **, u_int *, char ***, u_int **);

Actions: View | Diff

Attachments on bug 808: 568 | 569