diff options
author | Damien Miller <djm@mindrot.org> | 2013-02-12 11:04:48 +1100 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2013-02-12 11:04:48 +1100 |
commit | 22e8a1e1695f1c8179cea61ac63b2fdd4b11f2d7 (patch) | |
tree | a1b49ac1ff7a2ddf47d85ce85f32d7da213de1ae | |
parent | 894926ebd8cc3d6651ad1a3a1269a60ef127cd44 (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-- | ChangeLog | 3 | ||||
-rw-r--r-- | sshd.c | 5 |
2 files changed, 6 insertions, 2 deletions
@@ -49,6 +49,9 @@ | |||
49 | record "Received disconnect" messages at ERROR rather than INFO priority, | 49 | record "Received disconnect" messages at ERROR rather than INFO priority, |
50 | since they are abnormal and result in a non-zero ssh exit status; patch | 50 | since they are abnormal and result in a non-zero ssh exit status; patch |
51 | from Iain Morgan in bz#2057; ok dtucker@ | 51 | from Iain Morgan in bz#2057; ok dtucker@ |
52 | - dtucker@cvs.openbsd.org 2013/02/11 21:21:58 | ||
53 | [sshd.c] | ||
54 | Add openssl version to debug output similar to the client. ok markus@ | ||
52 | 55 | ||
53 | 20130211 | 56 | 20130211 |
54 | - (djm) [configure.ac openbsd-compat/openssl-compat.h] Repair build on old | 57 | - (djm) [configure.ac openbsd-compat/openssl-compat.h] Repair build on old |
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: sshd.c,v 1.396 2012/11/04 11:09:15 djm Exp $ */ | 1 | /* $OpenBSD: sshd.c,v 1.397 2013/02/11 21:21:58 dtucker 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 |
@@ -1596,7 +1596,8 @@ main(int ac, char **av) | |||
1596 | exit(1); | 1596 | exit(1); |
1597 | } | 1597 | } |
1598 | 1598 | ||
1599 | debug("sshd version %.100s", SSH_RELEASE); | 1599 | debug("sshd version %s, %s", SSH_VERSION, |
1600 | SSLeay_version(SSLEAY_VERSION)); | ||
1600 | 1601 | ||
1601 | /* Store privilege separation user for later use if required. */ | 1602 | /* Store privilege separation user for later use if required. */ |
1602 | if ((privsep_pw = getpwnam(SSH_PRIVSEP_USER)) == NULL) { | 1603 | if ((privsep_pw = getpwnam(SSH_PRIVSEP_USER)) == NULL) { |