diff options
author | Colin Watson <cjwatson@debian.org> | 2005-01-04 13:07:27 +0000 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2005-01-04 13:07:27 +0000 |
commit | fd0f611b70a83d80fe8793af785542ee5541b7cd (patch) | |
tree | bededd22bb7eeec52e20083237ab7e4113445a16 /session.h | |
parent | c44fe9a5b9d3db96a7249b04d915f17e4a3a3b04 (diff) | |
parent | ebd2ce335af5861020c79fddb1ae35c03bf036cf (diff) |
Merge 3.9p1 to the trunk.
Diffstat (limited to 'session.h')
-rw-r--r-- | session.h | 10 |
1 files changed, 6 insertions, 4 deletions
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: session.h,v 1.21 2003/09/23 20:17:11 markus Exp $ */ | 1 | /* $OpenBSD: session.h,v 1.23 2004/07/17 05:31:41 dtucker 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. |
@@ -39,9 +39,6 @@ struct Session { | |||
39 | int ptyfd, ttyfd, ptymaster; | 39 | int ptyfd, ttyfd, ptymaster; |
40 | u_int row, col, xpixel, ypixel; | 40 | u_int row, col, xpixel, ypixel; |
41 | char tty[TTYSZ]; | 41 | char tty[TTYSZ]; |
42 | /* last login */ | ||
43 | char hostname[MAXHOSTNAMELEN]; | ||
44 | time_t last_login_time; | ||
45 | /* X11 */ | 42 | /* X11 */ |
46 | u_int display_number; | 43 | u_int display_number; |
47 | char *display; | 44 | char *display; |
@@ -53,6 +50,11 @@ struct Session { | |||
53 | /* proto 2 */ | 50 | /* proto 2 */ |
54 | int chanid; | 51 | int chanid; |
55 | int is_subsystem; | 52 | int is_subsystem; |
53 | int num_env; | ||
54 | struct { | ||
55 | char *name; | ||
56 | char *val; | ||
57 | } *env; | ||
56 | }; | 58 | }; |
57 | 59 | ||
58 | void do_authenticated(Authctxt *); | 60 | void do_authenticated(Authctxt *); |