From 525a0b090fc03d38bb760c858a5a5958cd0bc276 Mon Sep 17 00:00:00 2001
From: Damien Miller <djm@mindrot.org>
Date: Sun, 23 Apr 2006 12:10:49 +1000
Subject: [PATCH]    - djm@cvs.openbsd.org 2006/04/20 21:53:44      [includes.h
 session.c sftp.c]      Switch from using pipes to socketpairs for
 communication between      sftp/scp and ssh, and between sshd and its
 subprocesses. This saves      a file descriptor per session and apparently
 makes userland ppp over      ssh work; ok markus@ deraadt@ (ID Sync only -
 portable makes this      decision on a per-platform basis)

---
 ChangeLog  | 9 ++++++++-
 includes.h | 2 +-
 session.c  | 2 +-
 sftp.c     | 2 +-
 4 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 552e780ee..02e675c4e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -55,6 +55,13 @@
    - markus@cvs.openbsd.org 2006/04/20 09:47:59
      [sshconnect.c]
      simplify; ok djm@
+   - djm@cvs.openbsd.org 2006/04/20 21:53:44
+     [includes.h session.c sftp.c]
+     Switch from using pipes to socketpairs for communication between
+     sftp/scp and ssh, and between sshd and its subprocesses. This saves
+     a file descriptor per session and apparently makes userland ppp over
+     ssh work; ok markus@ deraadt@ (ID Sync only - portable makes this
+     decision on a per-platform basis)
 
 20060421
  - (djm) [Makefile.in configure.ac session.c sshpty.c]
@@ -4566,4 +4573,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.4313 2006/04/23 02:08:59 djm Exp $
+$Id: ChangeLog,v 1.4314 2006/04/23 02:10:49 djm Exp $
diff --git a/includes.h b/includes.h
index 00076f639..c038f410e 100644
--- a/includes.h
+++ b/includes.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: includes.h,v 1.39 2006/03/25 22:22:43 djm Exp $ */
+/* $OpenBSD: includes.h,v 1.40 2006/04/20 21:53:44 djm Exp $ */
 
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
diff --git a/session.c b/session.c
index bba3fa21f..caf750ab4 100644
--- a/session.c
+++ b/session.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: session.c,v 1.202 2006/03/25 13:17:02 djm Exp $ */
+/* $OpenBSD: session.c,v 1.203 2006/04/20 21:53:44 djm Exp $ */
 /*
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
  *                    All rights reserved
diff --git a/sftp.c b/sftp.c
index 31b71db2b..0cc3a470e 100644
--- a/sftp.c
+++ b/sftp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sftp.c,v 1.80 2006/03/27 23:15:46 djm Exp $ */
+/* $OpenBSD: sftp.c,v 1.81 2006/04/20 21:53:44 djm Exp $ */
 /*
  * Copyright (c) 2001-2004 Damien Miller <djm@openbsd.org>
  *