summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2005-05-26 12:01:22 +1000
committerDamien Miller <djm@mindrot.org>2005-05-26 12:01:22 +1000
commit1b0de9a04127eeec9a5352abd16113bb8faa494c (patch)
tree00c7793912ada135aadcb2f2a7a5d8df2149e220
parent4f1d6b2c112be24f6ecfcb81b56f0180ec76ea66 (diff)
- dtucker@cvs.openbsd.org 2005/04/06 12:26:06
[ssh.c] Fix debug call for port forwards; patch from pete at seebeyond.com, ok djm@ (ID sync only - change already in portable)
-rw-r--r--ChangeLog6
-rw-r--r--ssh.c2
2 files changed, 6 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 32212bcb..7712c31c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -8,6 +8,10 @@
[sshd.c]
avoid harmless logspam by not performing setsockopt() on non-socket;
ok markus@
+ - dtucker@cvs.openbsd.org 2005/04/06 12:26:06
+ [ssh.c]
+ Fix debug call for port forwards; patch from pete at seebeyond.com,
+ ok djm@ (ID sync only - change already in portable)
20050524
- (djm) [contrib/caldera/openssh.spec contrib/redhat/openssh.spec]
@@ -2507,4 +2511,4 @@
- (djm) Trim deprecated options from INSTALL. Mention UsePAM
- (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
-$Id: ChangeLog,v 1.3763 2005/05/26 01:59:32 djm Exp $
+$Id: ChangeLog,v 1.3764 2005/05/26 02:01:22 djm Exp $
diff --git a/ssh.c b/ssh.c
index 1f19229b..cff54b9d 100644
--- a/ssh.c
+++ b/ssh.c
@@ -40,7 +40,7 @@
*/
#include "includes.h"
-RCSID("$OpenBSD: ssh.c,v 1.234 2005/03/10 22:01:06 deraadt Exp $");
+RCSID("$OpenBSD: ssh.c,v 1.235 2005/04/06 12:26:06 dtucker Exp $");
#include <openssl/evp.h>
#include <openssl/err.h>