diff options
| author | Damien Miller <djm@mindrot.org> | 2013-07-20 05:21:52 +0200 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2013-07-20 05:21:52 +0200 |
| commit | 85b45e09188e7a7fc8f0a900a4c6a0f04a5720a7 (patch) | |
| tree | 575942d7e7a835c3b89b59eb0e9e0ecf34f1811b /session.c | |
| parent | - djm@cvs.openbsd.org 2013/07/18 01:12:26 (diff) | |
| download | openssh-85b45e09188e7a7fc8f0a900a4c6a0f04a5720a7.tar.xz openssh-85b45e09188e7a7fc8f0a900a4c6a0f04a5720a7.zip | |
- markus@cvs.openbsd.org 2013/07/19 07:37:48
[auth.h kex.h kexdhs.c kexecdhs.c kexgexs.c monitor.c servconf.c]
[servconf.h session.c sshd.c sshd_config.5]
add ssh-agent(1) support to sshd(8); allows encrypted hostkeys,
or hostkeys on smartcards; most of the work by Zev Weiss; bz #1974
ok djm@
Diffstat (limited to 'session.c')
| -rw-r--r-- | session.c | 10 |
1 files changed, 9 insertions, 1 deletions
@@ -1,4 +1,4 @@ -/* $OpenBSD: session.c,v 1.265 2013/05/17 00:13:14 djm Exp $ */ +/* $OpenBSD: session.c,v 1.266 2013/07/19 07:37:48 markus Exp $ */ /* * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland * All rights reserved @@ -80,6 +80,7 @@ #include "hostfile.h" #include "auth.h" #include "auth-options.h" +#include "authfd.h" #include "pathnames.h" #include "log.h" #include "servconf.h" @@ -1589,6 +1590,13 @@ launch_login(struct passwd *pw, const char *hostname) static void child_close_fds(void) { + extern AuthenticationConnection *auth_conn; + + if (auth_conn) { + ssh_close_authentication_connection(auth_conn); + auth_conn = NULL; + } + if (packet_get_connection_in() == packet_get_connection_out()) close(packet_get_connection_in()); else { |