diff options
author | Damien Miller <djm@mindrot.org> | 2006-03-26 00:06:32 +1100 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2006-03-26 00:06:32 +1100 |
commit | 1345e617da1cdf8c62db7c372e2cd5762cb31f7f (patch) | |
tree | 912d70cd87d3225b0d29115c8ca02f04d85e4789 | |
parent | ed3986a00492c5a7f1f284f724dc4dd4063ea785 (diff) |
- deraadt@cvs.openbsd.org 2006/03/20 18:26:55
[session.h]
annoying spacing fixes getting in the way of real diffs
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | session.h | 7 |
2 files changed, 9 insertions, 3 deletions
@@ -47,6 +47,9 @@ | |||
47 | - deraadt@cvs.openbsd.org 2006/03/20 18:14:02 | 47 | - deraadt@cvs.openbsd.org 2006/03/20 18:14:02 |
48 | [monitor_wrap.h sshpty.h] | 48 | [monitor_wrap.h sshpty.h] |
49 | sprinkle u_int throughout pty subsystem, ok markus | 49 | sprinkle u_int throughout pty subsystem, ok markus |
50 | - deraadt@cvs.openbsd.org 2006/03/20 18:26:55 | ||
51 | [session.h] | ||
52 | annoying spacing fixes getting in the way of real diffs | ||
50 | 53 | ||
51 | 20060318 | 54 | 20060318 |
52 | - (djm) [auth-pam.c] Fix memleak in error path, from Coverity via | 55 | - (djm) [auth-pam.c] Fix memleak in error path, from Coverity via |
@@ -4239,4 +4242,4 @@ | |||
4239 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM | 4242 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM |
4240 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu | 4243 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu |
4241 | 4244 | ||
4242 | $Id: ChangeLog,v 1.4237 2006/03/25 13:06:14 djm Exp $ | 4245 | $Id: ChangeLog,v 1.4238 2006/03/25 13:06:32 djm Exp $ |
@@ -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.26 2006/03/20 18:26:55 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 | ||
61 | void do_authenticated(Authctxt *); | 64 | void do_authenticated(Authctxt *); |