summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2013-10-17 11:57:23 +1100
committerDamien Miller <djm@mindrot.org>2013-10-17 11:57:23 +1100
commite3ea09494dcfe7ba76536e95765c8328ecfc18fb (patch)
treea4fc1bb977c4fb2533b6c6fb9a104df7d07c1db6
parentf29238e67471a7f1088a99c3c3dbafce76b790cf (diff)
- djm@cvs.openbsd.org 2013/10/17 00:46:49
[ssh.c] rearrange check to reduce diff against -portable (Id sync only)
-rw-r--r--ChangeLog4
-rw-r--r--ssh.c2
2 files changed, 5 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 537f9f56b..732fdc2cb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -29,6 +29,10 @@
29 client support to allow calling fsync() faster successful transfer 29 client support to allow calling fsync() faster successful transfer
30 patch mostly by imorgan AT nas.nasa.gov; bz#1798 30 patch mostly by imorgan AT nas.nasa.gov; bz#1798
31 "fine" markus@ "grumble OK" deraadt@ "doesn't sound bad to me" millert@ 31 "fine" markus@ "grumble OK" deraadt@ "doesn't sound bad to me" millert@
32 - djm@cvs.openbsd.org 2013/10/17 00:46:49
33 [ssh.c]
34 rearrange check to reduce diff against -portable
35 (Id sync only)
32 36
3320131015 3720131015
34 - (djm) OpenBSD CVS Sync 38 - (djm) OpenBSD CVS Sync
diff --git a/ssh.c b/ssh.c
index 935390726..835f4822a 100644
--- a/ssh.c
+++ b/ssh.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: ssh.c,v 1.387 2013/10/16 22:58:01 djm Exp $ */ 1/* $OpenBSD: ssh.c,v 1.388 2013/10/17 00:46:49 djm Exp $ */
2/* 2/*
3 * Author: Tatu Ylonen <ylo@cs.hut.fi> 3 * Author: Tatu Ylonen <ylo@cs.hut.fi>
4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland 4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland