summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2008-05-19 16:02:37 +1000
committerDamien Miller <djm@mindrot.org>2008-05-19 16:02:37 +1000
commitb3da593962885883feca47ceb36617ab3eafcee8 (patch)
tree5f9758f28771c3a3f409d5cfc3576ca625dac457
parentb1cbfa25f1618b277de670b943acb07ff5dbb1ac (diff)
- djm@cvs.openbsd.org 2008/05/09 14:26:08
[ssh.c] dingo stole my diff hunk
-rw-r--r--ChangeLog5
-rw-r--r--ssh.c2
2 files changed, 5 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 90ee86ac8..e4cff0070 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -117,6 +117,9 @@
117 making the function names more consistent - making ssh.c and 117 making the function names more consistent - making ssh.c and
118 clientloop.c a fair bit more readable. 118 clientloop.c a fair bit more readable.
119 ok markus@ 119 ok markus@
120 - djm@cvs.openbsd.org 2008/05/09 14:26:08
121 [ssh.c]
122 dingo stole my diff hunk
120 123
12120080403 12420080403
122 - (djm) [openbsd-compat/bsd-poll.c] Include stdlib.h to avoid compile- 125 - (djm) [openbsd-compat/bsd-poll.c] Include stdlib.h to avoid compile-
@@ -3977,4 +3980,4 @@
3977 OpenServer 6 and add osr5bigcrypt support so when someone migrates 3980 OpenServer 6 and add osr5bigcrypt support so when someone migrates
3978 passwords between UnixWare and OpenServer they will still work. OK dtucker@ 3981 passwords between UnixWare and OpenServer they will still work. OK dtucker@
3979 3982
3980$Id: ChangeLog,v 1.4926 2008/05/19 06:00:08 djm Exp $ 3983$Id: ChangeLog,v 1.4927 2008/05/19 06:02:37 djm Exp $
diff --git a/ssh.c b/ssh.c
index c944d0ad6..3bcca53ee 100644
--- a/ssh.c
+++ b/ssh.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: ssh.c,v 1.312 2008/05/09 14:18:44 djm Exp $ */ 1/* $OpenBSD: ssh.c,v 1.313 2008/05/09 14:26:08 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