summaryrefslogtreecommitdiff
path: root/auth2.c
diff options
context:
space:
mode:
Diffstat (limited to 'auth2.c')
-rw-r--r--auth2.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/auth2.c b/auth2.c
index 2ea71210c..1f023e8b1 100644
--- a/auth2.c
+++ b/auth2.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: auth2.c,v 1.153 2019/01/19 21:38:24 djm Exp $ */ 1/* $OpenBSD: auth2.c,v 1.154 2019/01/19 21:41:18 djm Exp $ */
2/* 2/*
3 * Copyright (c) 2000 Markus Friedl. All rights reserved. 3 * Copyright (c) 2000 Markus Friedl. All rights reserved.
4 * 4 *
@@ -284,7 +284,7 @@ input_userauth_request(int type, u_int32_t seq, struct ssh *ssh)
284 284
285 if (authctxt->attempt++ == 0) { 285 if (authctxt->attempt++ == 0) {
286 /* setup auth context */ 286 /* setup auth context */
287 authctxt->pw = PRIVSEP(getpwnamallow(user)); 287 authctxt->pw = PRIVSEP(getpwnamallow(ssh, user));
288 authctxt->user = xstrdup(user); 288 authctxt->user = xstrdup(user);
289 if (authctxt->pw && strcmp(service, "ssh-connection")==0) { 289 if (authctxt->pw && strcmp(service, "ssh-connection")==0) {
290 authctxt->valid = 1; 290 authctxt->valid = 1;
@@ -381,7 +381,7 @@ userauth_finish(struct ssh *ssh, int authenticated, const char *method,
381 } 381 }
382 382
383 /* Log before sending the reply */ 383 /* Log before sending the reply */
384 auth_log(authctxt, authenticated, partial, method, submethod); 384 auth_log(ssh, authenticated, partial, method, submethod);
385 385
386 /* Update information exposed to session */ 386 /* Update information exposed to session */
387 if (authenticated || partial) 387 if (authenticated || partial)
@@ -429,7 +429,7 @@ userauth_finish(struct ssh *ssh, int authenticated, const char *method,
429#ifdef SSH_AUDIT_EVENTS 429#ifdef SSH_AUDIT_EVENTS
430 PRIVSEP(audit_event(SSH_LOGIN_EXCEED_MAXTRIES)); 430 PRIVSEP(audit_event(SSH_LOGIN_EXCEED_MAXTRIES));
431#endif 431#endif
432 auth_maxtries_exceeded(authctxt); 432 auth_maxtries_exceeded(ssh);
433 } 433 }
434 methods = authmethods_get(authctxt); 434 methods = authmethods_get(authctxt);
435 debug3("%s: failure partial=%d next methods=\"%s\"", __func__, 435 debug3("%s: failure partial=%d next methods=\"%s\"", __func__,