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

- stevesk@cvs.openbsd.org 2006/08/04 20:46:05 

[monitor.c session.c ssh-agent.c]
     spaces
This commit is contained in:
Damien Miller 2006-08-05 12:40:11 +10:00
parent d783435315
commit 9ab00b44c1
4 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -82,6 +82,9 @@
NB. portable commit contains everything *except* removing includes.h, as NB. portable commit contains everything *except* removing includes.h, as
that will take a fair bit more work as we move headers that are required that will take a fair bit more work as we move headers that are required
for portability workarounds to defines.h. (also, this step wasn't "easy") for portability workarounds to defines.h. (also, this step wasn't "easy")
- stevesk@cvs.openbsd.org 2006/08/04 20:46:05
[monitor.c session.c ssh-agent.c]
spaces
20060804 20060804
- (dtucker) [configure.ac] The "crippled AES" test does not work on recent - (dtucker) [configure.ac] The "crippled AES" test does not work on recent
@ -5152,4 +5155,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.4452 2006/08/05 02:39:39 djm Exp $ $Id: ChangeLog,v 1.4453 2006/08/05 02:40:11 djm Exp $

6
monitor.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: monitor.c,v 1.85 2006/08/03 03:34:42 deraadt Exp $ */ /* $OpenBSD: monitor.c,v 1.86 2006/08/04 20:46:05 stevesk Exp $ */
/* /*
* Copyright 2002 Niels Provos <provos@citi.umich.edu> * Copyright 2002 Niels Provos <provos@citi.umich.edu>
* Copyright 2002 Markus Friedl <markus@openbsd.org> * Copyright 2002 Markus Friedl <markus@openbsd.org>
@ -1266,7 +1266,7 @@ mm_session_close(Session *s)
{ {
debug3("%s: session %d pid %ld", __func__, s->self, (long)s->pid); debug3("%s: session %d pid %ld", __func__, s->self, (long)s->pid);
if (s->ttyfd != -1) { if (s->ttyfd != -1) {
debug3("%s: tty %s ptyfd %d", __func__, s->tty, s->ptyfd); debug3("%s: tty %s ptyfd %d", __func__, s->tty, s->ptyfd);
session_pty_cleanup2(s); session_pty_cleanup2(s);
} }
s->used = 0; s->used = 0;
@ -1326,7 +1326,7 @@ mm_answer_pty(int sock, Buffer *m)
/* no need to dup() because nobody closes ptyfd */ /* no need to dup() because nobody closes ptyfd */
s->ptymaster = s->ptyfd; s->ptymaster = s->ptyfd;
debug3("%s: tty %s ptyfd %d", __func__, s->tty, s->ttyfd); debug3("%s: tty %s ptyfd %d", __func__, s->tty, s->ttyfd);
return (0); return (0);

4
session.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: session.c,v 1.216 2006/08/03 03:34:42 deraadt Exp $ */ /* $OpenBSD: session.c,v 1.217 2006/08/04 20:46:05 stevesk Exp $ */
/* /*
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
* All rights reserved * All rights reserved
@ -1598,7 +1598,7 @@ do_child(Session *s, const char *command)
do_rc_files(s, shell); do_rc_files(s, shell);
/* restore SIGPIPE for child */ /* restore SIGPIPE for child */
signal(SIGPIPE, SIG_DFL); signal(SIGPIPE, SIG_DFL);
if (options.use_login) { if (options.use_login) {
launch_login(pw, hostname); launch_login(pw, hostname);

4
ssh-agent.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: ssh-agent.c,v 1.151 2006/08/03 03:34:42 deraadt Exp $ */ /* $OpenBSD: ssh-agent.c,v 1.152 2006/08/04 20:46:05 stevesk Exp $ */
/* /*
* Author: Tatu Ylonen <ylo@cs.hut.fi> * Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@ -1015,7 +1015,7 @@ int
main(int ac, char **av) main(int ac, char **av)
{ {
int c_flag = 0, d_flag = 0, k_flag = 0, s_flag = 0; int c_flag = 0, d_flag = 0, k_flag = 0, s_flag = 0;
int sock, fd, ch; int sock, fd, ch;
u_int nalloc; u_int nalloc;
char *shell, *format, *pidstr, *agentsocket = NULL; char *shell, *format, *pidstr, *agentsocket = NULL;
fd_set *readsetp = NULL, *writesetp = NULL; fd_set *readsetp = NULL, *writesetp = NULL;