diff options
Diffstat (limited to 'security/openssh/files/patch-auth2.c')
| -rw-r--r-- | security/openssh/files/patch-auth2.c | 24 |
1 files changed, 6 insertions, 18 deletions
diff --git a/security/openssh/files/patch-auth2.c b/security/openssh/files/patch-auth2.c index 5359ba294756..23683cd1f3a2 100644 --- a/security/openssh/files/patch-auth2.c +++ b/security/openssh/files/patch-auth2.c @@ -1,6 +1,6 @@ ---- auth2.c.orig Mon May 13 04:37:39 2002 -+++ auth2.c Thu May 23 13:11:43 2002 -@@ -168,6 +168,15 @@ +--- auth2.c.orig Fri May 31 13:35:15 2002 ++++ auth2.c Fri Jun 21 22:49:07 2002 +@@ -133,6 +133,15 @@ Authmethod *m = NULL; char *user, *service, *method, *style = NULL; int authenticated = 0; @@ -16,7 +16,7 @@ if (authctxt == NULL) fatal("input_userauth_request: no authctxt"); -@@ -187,6 +196,11 @@ +@@ -152,6 +161,11 @@ if (authctxt->pw && strcmp(service, "ssh-connection")==0) { authctxt->valid = 1; debug2("input_userauth_request: setting up authctxt for %s", user); @@ -28,7 +28,7 @@ } else { log("input_userauth_request: illegal user %s", user); } -@@ -203,6 +217,41 @@ +@@ -168,6 +182,41 @@ "(%s,%s) -> (%s,%s)", authctxt->user, authctxt->service, user, service); } @@ -70,7 +70,7 @@ /* reset state */ auth2_challenge_stop(authctxt); authctxt->postponed = 0; -@@ -213,6 +262,12 @@ +@@ -178,6 +227,12 @@ debug2("input_userauth_request: try method %s", method); authenticated = m->userauth(authctxt); } @@ -83,15 +83,3 @@ userauth_finish(authctxt, authenticated, method); xfree(service); -@@ -321,7 +376,11 @@ - m->enabled = NULL; - packet_check_eom(); - userauth_banner(); -+#ifdef USE_PAM -+ return (authctxt->valid ? PRIVSEP(auth_pam_password(authctxt, "")) : 0); -+#else - return (authctxt->valid ? PRIVSEP(auth_password(authctxt, "")) : 0); -+#endif - } - - static int |