summaryrefslogtreecommitdiff
path: root/session.c
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2013-07-20 13:21:52 +1000
committerDamien Miller <djm@mindrot.org>2013-07-20 13:21:52 +1000
commit85b45e09188e7a7fc8f0a900a4c6a0f04a5720a7 (patch)
tree575942d7e7a835c3b89b59eb0e9e0ecf34f1811b /session.c
parentd93340cbb6bc0fc0dbd4427e0cec6d994a494dd9 (diff)
- 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.c10
1 files changed, 9 insertions, 1 deletions
diff --git a/session.c b/session.c
index 1424825ca..d4b57bdfb 100644
--- a/session.c
+++ b/session.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: session.c,v 1.265 2013/05/17 00:13:14 djm Exp $ */ 1/* $OpenBSD: session.c,v 1.266 2013/07/19 07:37:48 markus Exp $ */
2/* 2/*
3 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland 3 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
4 * All rights reserved 4 * All rights reserved
@@ -80,6 +80,7 @@
80#include "hostfile.h" 80#include "hostfile.h"
81#include "auth.h" 81#include "auth.h"
82#include "auth-options.h" 82#include "auth-options.h"
83#include "authfd.h"
83#include "pathnames.h" 84#include "pathnames.h"
84#include "log.h" 85#include "log.h"
85#include "servconf.h" 86#include "servconf.h"
@@ -1589,6 +1590,13 @@ launch_login(struct passwd *pw, const char *hostname)
1589static void 1590static void
1590child_close_fds(void) 1591child_close_fds(void)
1591{ 1592{
1593 extern AuthenticationConnection *auth_conn;
1594
1595 if (auth_conn) {
1596 ssh_close_authentication_connection(auth_conn);
1597 auth_conn = NULL;
1598 }
1599
1592 if (packet_get_connection_in() == packet_get_connection_out()) 1600 if (packet_get_connection_in() == packet_get_connection_out())
1593 close(packet_get_connection_in()); 1601 close(packet_get_connection_in());
1594 else { 1602 else {