summaryrefslogtreecommitdiff
path: root/session.h
diff options
context:
space:
mode:
authorColin Watson <cjwatson@debian.org>2009-12-29 21:38:40 +0000
committerColin Watson <cjwatson@debian.org>2009-12-29 21:38:40 +0000
commit1b816ea846aca3ee89e7995373ace609e9518424 (patch)
treeb41cdc8495cae7fa9c2e0f98a5f2e71656b61f9a /session.h
parentfa585019a79ebcb4e0202b1c33f87ff1c5c9ce1c (diff)
parent086ea76990b1e6287c24b6db74adffd4605eb3b0 (diff)
import openssh-4.6p1-gsskex-20070312.patch
Diffstat (limited to 'session.h')
-rw-r--r--session.h7
1 files changed, 5 insertions, 2 deletions
diff --git a/session.h b/session.h
index a2598a99c..ee9338e4f 100644
--- a/session.h
+++ b/session.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: session.h,v 1.25 2005/07/17 06:49:04 djm Exp $ */ 1/* $OpenBSD: session.h,v 1.29 2006/08/03 03:34:42 deraadt Exp $ */
2 2
3/* 3/*
4 * Copyright (c) 2000, 2001 Markus Friedl. All rights reserved. 4 * Copyright (c) 2000, 2001 Markus Friedl. All rights reserved.
@@ -34,11 +34,13 @@ struct Session {
34 struct passwd *pw; 34 struct passwd *pw;
35 Authctxt *authctxt; 35 Authctxt *authctxt;
36 pid_t pid; 36 pid_t pid;
37
37 /* tty */ 38 /* tty */
38 char *term; 39 char *term;
39 int ptyfd, ttyfd, ptymaster; 40 int ptyfd, ttyfd, ptymaster;
40 u_int row, col, xpixel, ypixel; 41 u_int row, col, xpixel, ypixel;
41 char tty[TTYSZ]; 42 char tty[TTYSZ];
43
42 /* X11 */ 44 /* X11 */
43 u_int display_number; 45 u_int display_number;
44 char *display; 46 char *display;
@@ -47,6 +49,7 @@ struct Session {
47 char *auth_proto; 49 char *auth_proto;
48 char *auth_data; 50 char *auth_data;
49 int single_connection; 51 int single_connection;
52
50 /* proto 2 */ 53 /* proto 2 */
51 int chanid; 54 int chanid;
52 int *x11_chanids; 55 int *x11_chanids;
@@ -55,7 +58,7 @@ struct Session {
55 struct { 58 struct {
56 char *name; 59 char *name;
57 char *val; 60 char *val;
58 } *env; 61 } *env;
59}; 62};
60 63
61void do_authenticated(Authctxt *); 64void do_authenticated(Authctxt *);