summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--ssh.c2
2 files changed, 6 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 32212bcbf..7712c31c9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -8,6 +8,10 @@
8 [sshd.c] 8 [sshd.c]
9 avoid harmless logspam by not performing setsockopt() on non-socket; 9 avoid harmless logspam by not performing setsockopt() on non-socket;
10 ok markus@ 10 ok markus@
11 - dtucker@cvs.openbsd.org 2005/04/06 12:26:06
12 [ssh.c]
13 Fix debug call for port forwards; patch from pete at seebeyond.com,
14 ok djm@ (ID sync only - change already in portable)
11 15
1220050524 1620050524
13 - (djm) [contrib/caldera/openssh.spec contrib/redhat/openssh.spec] 17 - (djm) [contrib/caldera/openssh.spec contrib/redhat/openssh.spec]
@@ -2507,4 +2511,4 @@
2507 - (djm) Trim deprecated options from INSTALL. Mention UsePAM 2511 - (djm) Trim deprecated options from INSTALL. Mention UsePAM
2508 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu 2512 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
2509 2513
2510$Id: ChangeLog,v 1.3763 2005/05/26 01:59:32 djm Exp $ 2514$Id: ChangeLog,v 1.3764 2005/05/26 02:01:22 djm Exp $
diff --git a/ssh.c b/ssh.c
index 1f19229b7..cff54b9d6 100644
--- a/ssh.c
+++ b/ssh.c
@@ -40,7 +40,7 @@
40 */ 40 */
41 41
42#include "includes.h" 42#include "includes.h"
43RCSID("$OpenBSD: ssh.c,v 1.234 2005/03/10 22:01:06 deraadt Exp $"); 43RCSID("$OpenBSD: ssh.c,v 1.235 2005/04/06 12:26:06 dtucker Exp $");
44 44
45#include <openssl/evp.h> 45#include <openssl/evp.h>
46#include <openssl/err.h> 46#include <openssl/err.h>