summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2013-05-17 09:41:33 +1000
committerDarren Tucker <dtucker@zip.com.au>2013-05-17 09:41:33 +1000
commit5e95173715d516e6014485e2b6def1fb3db84036 (patch)
tree83a9ae6926e429b0af0d6fd9b5a6c17211d4e127
parenta4df65b9fc68a555a7d8781700475fb03ed6e694 (diff)
- djm@cvs.openbsd.org 2013/05/10 03:46:14
[modpipe.c] sync some portability changes from portable OpenSSH (id sync only)
-rw-r--r--ChangeLog3
-rwxr-xr-xregress/modpipe.c2
2 files changed, 4 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 46f2d5e8b..5df073c92 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -27,6 +27,9 @@
27 - dtucker@cvs.openbsd.org 2013/04/22 07:23:08 27 - dtucker@cvs.openbsd.org 2013/04/22 07:23:08
28 [regress/multiplex.sh] 28 [regress/multiplex.sh]
29 Write mux master logs to regress.log instead of ssh.log to keep separate 29 Write mux master logs to regress.log instead of ssh.log to keep separate
30 - djm@cvs.openbsd.org 2013/05/10 03:46:14
31 [modpipe.c]
32 sync some portability changes from portable OpenSSH (id sync only)
30 33
3120130516 3420130516
32 - (djm) [contrib/ssh-copy-id] Fix bug that could cause "rm *" to be 35 - (djm) [contrib/ssh-copy-id] Fix bug that could cause "rm *" to be
diff --git a/regress/modpipe.c b/regress/modpipe.c
index 3322d1a70..85747cf7d 100755
--- a/regress/modpipe.c
+++ b/regress/modpipe.c
@@ -14,7 +14,7 @@
14 * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. 14 * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
15 */ 15 */
16 16
17/* $OpenBSD: modpipe.c,v 1.4 2013/02/20 08:29:27 djm Exp $ */ 17/* $OpenBSD: modpipe.c,v 1.5 2013/05/10 03:46:14 djm Exp $ */
18 18
19#include "includes.h" 19#include "includes.h"
20 20