diff options
| author | Damien Miller <djm@cvs.openbsd.org> | 2019-01-19 21:43:08 +0000 |
|---|---|---|
| committer | Damien Miller <djm@cvs.openbsd.org> | 2019-01-19 21:43:08 +0000 |
| commit | 6b1fb1f495d3a29019ae3a1919db924edf979e7c (patch) | |
| tree | 0923b124a4127a99f333195a28dbad24d843968b /usr.bin/ssh/sshd.c | |
| parent | 439a3c76274346daf199881609cff0fbd4dc5200 (diff) | |
convert monitor.c to new packet API
with & ok markus@
Diffstat (limited to 'usr.bin/ssh/sshd.c')
| -rw-r--r-- | usr.bin/ssh/sshd.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/usr.bin/ssh/sshd.c b/usr.bin/ssh/sshd.c index f85acbdd925..9c508104717 100644 --- a/usr.bin/ssh/sshd.c +++ b/usr.bin/ssh/sshd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sshd.c,v 1.525 2019/01/19 21:42:30 djm Exp $ */ +/* $OpenBSD: sshd.c,v 1.526 2019/01/19 21:43:07 djm Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -423,7 +423,6 @@ privsep_preauth_child(void) static int privsep_preauth(struct ssh *ssh) { - Authctxt *authctxt = (Authctxt *)ssh->authctxt; int status, r; pid_t pid; struct ssh_sandbox *box = NULL; @@ -452,7 +451,7 @@ privsep_preauth(struct ssh *ssh) } if (box != NULL) ssh_sandbox_parent_preauth(box, pid); - monitor_child_preauth(authctxt, pmonitor); + monitor_child_preauth(ssh, pmonitor); /* Wait for the child's exit status */ while (waitpid(pid, &status, 0) < 0) { @@ -508,8 +507,8 @@ privsep_postauth(struct ssh *ssh, Authctxt *authctxt) else if (pmonitor->m_pid != 0) { verbose("User child is on pid %ld", (long)pmonitor->m_pid); sshbuf_reset(loginmsg); - monitor_clear_keystate(pmonitor); - monitor_child_postauth(pmonitor); + monitor_clear_keystate(ssh, pmonitor); + monitor_child_postauth(ssh, pmonitor); /* NEVERREACHED */ exit(0); @@ -528,7 +527,7 @@ privsep_postauth(struct ssh *ssh, Authctxt *authctxt) skip: /* It is safe now to apply the key state */ - monitor_apply_keystate(pmonitor); + monitor_apply_keystate(ssh, pmonitor); /* * Tell the packet layer that authentication was successful, since |