summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2013-02-12 11:04:48 +1100
committerDamien Miller <djm@mindrot.org>2013-02-12 11:04:48 +1100
commit22e8a1e1695f1c8179cea61ac63b2fdd4b11f2d7 (patch)
treea1b49ac1ff7a2ddf47d85ce85f32d7da213de1ae
parent894926ebd8cc3d6651ad1a3a1269a60ef127cd44 (diff)
- dtucker@cvs.openbsd.org 2013/02/11 21:21:58
[sshd.c] Add openssl version to debug output similar to the client. ok markus@
-rw-r--r--ChangeLog3
-rw-r--r--sshd.c5
2 files changed, 6 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 6e1a85bc..01ba1fe3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -49,6 +49,9 @@
record "Received disconnect" messages at ERROR rather than INFO priority,
since they are abnormal and result in a non-zero ssh exit status; patch
from Iain Morgan in bz#2057; ok dtucker@
+ - dtucker@cvs.openbsd.org 2013/02/11 21:21:58
+ [sshd.c]
+ Add openssl version to debug output similar to the client. ok markus@
20130211
- (djm) [configure.ac openbsd-compat/openssl-compat.h] Repair build on old
diff --git a/sshd.c b/sshd.c
index af7ff91b..3e9d1764 100644
--- a/sshd.c
+++ b/sshd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sshd.c,v 1.396 2012/11/04 11:09:15 djm Exp $ */
+/* $OpenBSD: sshd.c,v 1.397 2013/02/11 21:21:58 dtucker Exp $ */
/*
* Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -1596,7 +1596,8 @@ main(int ac, char **av)
exit(1);
}
- debug("sshd version %.100s", SSH_RELEASE);
+ debug("sshd version %s, %s", SSH_VERSION,
+ SSLeay_version(SSLEAY_VERSION));
/* Store privilege separation user for later use if required. */
if ((privsep_pw = getpwnam(SSH_PRIVSEP_USER)) == NULL) {