diff options
| author | Dirk Meyer <dinoex@FreeBSD.org> | 2002-06-24 21:13:06 +0000 |
|---|---|---|
| committer | Dirk Meyer <dinoex@FreeBSD.org> | 2002-06-24 21:13:06 +0000 |
| commit | 499707792a06b5da6a172581a313c3a0ef69806b (patch) | |
| tree | f60b30dcf7200e30ccb95bca2e280b78e0e243c8 /security/openssh/files/patch-auth2.c | |
| parent | PERL -> REINPLACE_CMD. (diff) | |
Merge PAM-changes from openssh currrent
Fix build with SKEY=yes, pr# 36119
Cleanup pw_expire handling.
Add missing includes
Changes defaults to: PermitRootLogin=no, UsePrivilegeSeparation=no
Use $PREFIX/etc/ssh for config, updating manpages too.
Notes
Notes:
svn path=/head/; revision=61893
Diffstat (limited to 'security/openssh/files/patch-auth2.c')
| -rw-r--r-- | security/openssh/files/patch-auth2.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/security/openssh/files/patch-auth2.c b/security/openssh/files/patch-auth2.c index 23683cd1f3a2..6eb5ce175346 100644 --- a/security/openssh/files/patch-auth2.c +++ b/security/openssh/files/patch-auth2.c @@ -1,5 +1,5 @@ --- auth2.c.orig Fri May 31 13:35:15 2002 -+++ auth2.c Fri Jun 21 22:49:07 2002 ++++ auth2.c Mon Jun 24 07:02:04 2002 @@ -133,6 +133,15 @@ Authmethod *m = NULL; char *user, *service, *method, *style = NULL; @@ -16,19 +16,22 @@ if (authctxt == NULL) fatal("input_userauth_request: no authctxt"); -@@ -152,6 +161,11 @@ +@@ -152,8 +161,14 @@ if (authctxt->pw && strcmp(service, "ssh-connection")==0) { authctxt->valid = 1; debug2("input_userauth_request: setting up authctxt for %s", user); + +#ifdef USE_PAM -+ start_pam(pw); ++ start_pam(authctxt->pw); +#endif + } else { log("input_userauth_request: illegal user %s", user); ++ authctxt->pw = NULL; } -@@ -168,6 +182,41 @@ + setproctitle("%s%s", authctxt->pw ? user : "unknown", + use_privsep ? " [net]" : ""); +@@ -168,6 +183,41 @@ "(%s,%s) -> (%s,%s)", authctxt->user, authctxt->service, user, service); } @@ -70,7 +73,7 @@ /* reset state */ auth2_challenge_stop(authctxt); authctxt->postponed = 0; -@@ -178,6 +227,12 @@ +@@ -178,6 +228,12 @@ debug2("input_userauth_request: try method %s", method); authenticated = m->userauth(authctxt); } |