summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordtucker <dtucker>2014-01-19 04:28:01 +0000
committerdtucker <dtucker>2014-01-19 04:28:01 +0000
commit0bdb7063cd17d0cb68f632002136ccb9cb104884 (patch)
tree37dca0a2fbb922d9b65d7840317b246d5d714949
parente1fc368e7ceabe54d3e8477737088f85788e6bff (diff)
downloadopenssh-0bdb7063cd17d0cb68f632002136ccb9cb104884.tar.gz
- dtucker@cvs.openbsd.org 2014/01/18 09:36:26
[session.c] explicitly define USE_PIPES to 1 to prevent redefinition warnings in portable on platforms that use pipes for everything. From redhat @ redhat.
-rw-r--r--ChangeLog4
-rw-r--r--session.c4
2 files changed, 6 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index f6167009..d274fc4e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,10 @@
- dtucker@cvs.openbsd.org 2014/01/17 06:23:24
[sftp-server.c]
fix log message statvfs. ok djm
+ - dtucker@cvs.openbsd.org 2014/01/18 09:36:26
+ [session.c]
+ explicitly define USE_PIPES to 1 to prevent redefinition warnings in
+ portable on platforms that use pipes for everything.
20140118
- (dtucker) [uidswap.c] Prevent unused variable warnings on Cygwin. Patch
diff --git a/session.c b/session.c
index a0a0c2d9..924c11bc 100644
--- a/session.c
+++ b/session.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: session.c,v 1.268 2013/10/29 09:48:02 djm Exp $ */
+/* $OpenBSD: session.c,v 1.269 2014/01/18 09:36:26 dtucker Exp $ */
/*
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
* All rights reserved
@@ -441,7 +441,7 @@ do_authenticated1(Authctxt *authctxt)
}
}
-#define USE_PIPES
+#define USE_PIPES 1
/*
* This is called to fork and execute a command when we have no tty. This
* will call do_child from the child, and server_loop from the parent after