summaryrefslogtreecommitdiff
path: root/usr.bin/ssh/session.h
diff options
context:
space:
mode:
authorDamien Miller <djm@cvs.openbsd.org>2005-07-17 06:49:05 +0000
committerDamien Miller <djm@cvs.openbsd.org>2005-07-17 06:49:05 +0000
commitf437a54b8f92fd168212545d732da6323366f937 (patch)
treea2369a7654fb23cf4292a633212126b8f728ee52 /usr.bin/ssh/session.h
parent4370aee2db0cacfde63527b50090453554f0dbb1 (diff)
Fix a number of X11 forwarding channel leaks:
1. Refuse multiple X11 forwarding requests on the same session 2. Clean up all listeners after a single_connection X11 forward, not just the one that made the single connection 3. Destroy X11 listeners when the session owning them goes away testing and ok dtucker@
Diffstat (limited to 'usr.bin/ssh/session.h')
-rw-r--r--usr.bin/ssh/session.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/usr.bin/ssh/session.h b/usr.bin/ssh/session.h
index 92bd1657339..a2598a99c2e 100644
--- a/usr.bin/ssh/session.h
+++ b/usr.bin/ssh/session.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: session.h,v 1.24 2005/06/17 02:44:33 djm Exp $ */
+/* $OpenBSD: session.h,v 1.25 2005/07/17 06:49:04 djm Exp $ */
/*
* Copyright (c) 2000, 2001 Markus Friedl. All rights reserved.
@@ -49,6 +49,7 @@ struct Session {
int single_connection;
/* proto 2 */
int chanid;
+ int *x11_chanids;
int is_subsystem;
u_int num_env;
struct {