From 7c31809c4ae41e03e0d393ee7f00667c6e728477 Mon Sep 17 00:00:00 2001
From: Damien Miller <djm@mindrot.org>
Date: Tue, 22 Jan 2002 23:06:22 +1100
Subject: [PATCH]    - markus@cvs.openbsd.org 2001/12/21 12:17:33     
 [serverloop.c]      remove ifdef for USE_PIPES since fdin != fdout; ok djm@

---
 ChangeLog    |  5 ++++-
 serverloop.c | 10 +---------
 2 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 76c3e4cab..2bed33205 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -20,6 +20,9 @@
      [ssh-add.1 ssh-add.c]
      Try all standard key files (id_rsa, id_dsa, identity) when invoked with
      no arguments; ok markus@
+   - markus@cvs.openbsd.org 2001/12/21 12:17:33
+     [serverloop.c]
+     remove ifdef for USE_PIPES since fdin != fdout; ok djm@
 
 20020121
  - (djm) Rework ssh-rand-helper:
@@ -7167,4 +7170,4 @@
  - Wrote replacements for strlcpy and mkdtemp
  - Released 1.0pre1
 
-$Id: ChangeLog,v 1.1727 2002/01/22 12:05:59 djm Exp $
+$Id: ChangeLog,v 1.1728 2002/01/22 12:06:22 djm Exp $
diff --git a/serverloop.c b/serverloop.c
index 0754fe76f..d28b8611e 100644
--- a/serverloop.c
+++ b/serverloop.c
@@ -35,7 +35,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: serverloop.c,v 1.88 2001/12/20 22:50:24 djm Exp $");
+RCSID("$OpenBSD: serverloop.c,v 1.89 2001/12/21 12:17:33 markus Exp $");
 
 #include "xmalloc.h"
 #include "packet.h"
@@ -406,14 +406,10 @@ process_output(fd_set * writeset)
 		if (len < 0 && (errno == EINTR || errno == EAGAIN)) {
 			/* do nothing */
 		} else if (len <= 0) {
-#ifdef USE_PIPES
-			close(fdin);
-#else
 			if (fdin != fdout)
 				close(fdin);
 			else
 				shutdown(fdin, SHUT_WR); /* We will no longer send. */
-#endif
 			fdin = -1;
 		} else {
 			/* Successful write. */
@@ -563,14 +559,10 @@ server_loop(pid_t pid, int fdin_arg, int fdout_arg, int fderr_arg)
 		 * input data, cause a real eof by closing fdin.
 		 */
 		if (stdin_eof && fdin != -1 && buffer_len(&stdin_buffer) == 0) {
-#ifdef USE_PIPES
-			close(fdin);
-#else
 			if (fdin != fdout)
 				close(fdin);
 			else
 				shutdown(fdin, SHUT_WR); /* We will no longer send. */
-#endif
 			fdin = -1;
 		}
 		/* Make packets from buffered stderr data to send to the client. */