diff --git a/ChangeLog b/ChangeLog index e3be2709c..559639b89 100644 --- a/ChangeLog +++ b/ChangeLog @@ -47,6 +47,9 @@ - deraadt@cvs.openbsd.org 2006/03/20 18:14:02 [monitor_wrap.h sshpty.h] sprinkle u_int throughout pty subsystem, ok markus + - deraadt@cvs.openbsd.org 2006/03/20 18:26:55 + [session.h] + annoying spacing fixes getting in the way of real diffs 20060318 - (djm) [auth-pam.c] Fix memleak in error path, from Coverity via @@ -4239,4 +4242,4 @@ - (djm) Trim deprecated options from INSTALL. Mention UsePAM - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu -$Id: ChangeLog,v 1.4237 2006/03/25 13:06:14 djm Exp $ +$Id: ChangeLog,v 1.4238 2006/03/25 13:06:32 djm Exp $ diff --git a/session.h b/session.h index a2598a99c..2b8175c41 100644 --- a/session.h +++ b/session.h @@ -1,4 +1,4 @@ -/* $OpenBSD: session.h,v 1.25 2005/07/17 06:49:04 djm Exp $ */ +/* $OpenBSD: session.h,v 1.26 2006/03/20 18:26:55 deraadt Exp $ */ /* * Copyright (c) 2000, 2001 Markus Friedl. All rights reserved. @@ -34,11 +34,13 @@ struct Session { struct passwd *pw; Authctxt *authctxt; pid_t pid; + /* tty */ char *term; int ptyfd, ttyfd, ptymaster; u_int row, col, xpixel, ypixel; char tty[TTYSZ]; + /* X11 */ u_int display_number; char *display; @@ -47,6 +49,7 @@ struct Session { char *auth_proto; char *auth_data; int single_connection; + /* proto 2 */ int chanid; int *x11_chanids; @@ -55,7 +58,7 @@ struct Session { struct { char *name; char *val; - } *env; + } *env; }; void do_authenticated(Authctxt *);