tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- deraadt@cvs.openbsd.org 2006/03/20 18:26:55 

[session.h]
     annoying spacing fixes getting in the way of real diffs
This commit is contained in:
Damien Miller 2006-03-26 00:06:32 +11:00
parent ed3986a004
commit 1345e617da
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -47,6 +47,9 @@
- deraadt@cvs.openbsd.org 2006/03/20 18:14:02 - deraadt@cvs.openbsd.org 2006/03/20 18:14:02
[monitor_wrap.h sshpty.h] [monitor_wrap.h sshpty.h]
sprinkle u_int throughout pty subsystem, ok markus 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 20060318
- (djm) [auth-pam.c] Fix memleak in error path, from Coverity via - (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) Trim deprecated options from INSTALL. Mention UsePAM
- (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu - (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 $

5
session.h
View File

@ -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. * Copyright (c) 2000, 2001 Markus Friedl. All rights reserved.
@ -34,11 +34,13 @@ struct Session {
struct passwd *pw; struct passwd *pw;
Authctxt *authctxt; Authctxt *authctxt;
pid_t pid; pid_t pid;
/* tty */ /* tty */
char *term; char *term;
int ptyfd, ttyfd, ptymaster; int ptyfd, ttyfd, ptymaster;
u_int row, col, xpixel, ypixel; u_int row, col, xpixel, ypixel;
char tty[TTYSZ]; char tty[TTYSZ];
/* X11 */ /* X11 */
u_int display_number; u_int display_number;
char *display; char *display;
@ -47,6 +49,7 @@ struct Session {
char *auth_proto; char *auth_proto;
char *auth_data; char *auth_data;
int single_connection; int single_connection;
/* proto 2 */ /* proto 2 */
int chanid; int chanid;
int *x11_chanids; int *x11_chanids;