summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2014-04-01 14:42:46 +1100
committerDamien Miller <djm@mindrot.org>2014-04-01 14:42:46 +1100
commitc2e49062faccbcd7135c40d1c78c5c329c58fc2e (patch)
treece738d9ff09f4db0f43e01100fdb5e89e2824fd6
parent14928b7492abec82afa4c2b778fc03f78cd419b6 (diff)
- (djm) Use full release (e.g. 6.5p1) in debug output rather than just
version. From des@des.no
-rw-r--r--ChangeLog2
-rw-r--r--ssh.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 68d8a2a29..9cbc1cef1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,8 @@
120140401 120140401
2 - (djm) On platforms that support it, use prctl() to prevent sftp-server 2 - (djm) On platforms that support it, use prctl() to prevent sftp-server
3 from accessing /proc/self/{mem,maps}; patch from jann AT thejh.net 3 from accessing /proc/self/{mem,maps}; patch from jann AT thejh.net
4 - (djm) Use full release (e.g. 6.5p1) in debug output rather than just
5 version. From des@des.no
4 6
520140317 720140317
6 - (djm) [sandbox-seccomp-filter.c] Soft-fail stat() syscalls. Add XXX to 8 - (djm) [sandbox-seccomp-filter.c] Soft-fail stat() syscalls. Add XXX to
diff --git a/ssh.c b/ssh.c
index 1e6cb9000..76040fd59 100644
--- a/ssh.c
+++ b/ssh.c
@@ -876,7 +876,7 @@ main(int ac, char **av)
876 SYSLOG_FACILITY_USER, !use_syslog); 876 SYSLOG_FACILITY_USER, !use_syslog);
877 877
878 if (debug_flag) 878 if (debug_flag)
879 logit("%s, %s", SSH_VERSION, SSLeay_version(SSLEAY_VERSION)); 879 logit("%s, %s", SSH_RELEASE, SSLeay_version(SSLEAY_VERSION));
880 880
881 /* Parse the configuration files */ 881 /* Parse the configuration files */
882 process_config_files(pw); 882 process_config_files(pw);