summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--version.h4
2 files changed, 6 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 62fd4d68b..1e55e862d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,9 @@
4 [clientloop.c] 4 [clientloop.c]
5 do NOT fall back to the trused x11 cookie if generation of an untrusted 5 do NOT fall back to the trused x11 cookie if generation of an untrusted
6 cookie fails; from security-alert at sun.com; ok dtucker 6 cookie fails; from security-alert at sun.com; ok dtucker
7 - markus@cvs.openbsd.org 2007/08/15 08:16:49
8 [version.h]
9 openssh 4.7
7 10
820070813 1120070813
9 - (dtucker) [session.c] Bug #1339: ensure that pam_setcred() is always 12 - (dtucker) [session.c] Bug #1339: ensure that pam_setcred() is always
@@ -3159,4 +3162,4 @@
3159 OpenServer 6 and add osr5bigcrypt support so when someone migrates 3162 OpenServer 6 and add osr5bigcrypt support so when someone migrates
3160 passwords between UnixWare and OpenServer they will still work. OK dtucker@ 3163 passwords between UnixWare and OpenServer they will still work. OK dtucker@
3161 3164
3162$Id: ChangeLog,v 1.4726 2007/08/15 09:13:41 dtucker Exp $ 3165$Id: ChangeLog,v 1.4727 2007/08/15 09:14:52 dtucker Exp $
diff --git a/version.h b/version.h
index 0f4811120..6fcd7e075 100644
--- a/version.h
+++ b/version.h
@@ -1,6 +1,6 @@
1/* $OpenBSD: version.h,v 1.49 2007/03/06 10:13:14 djm Exp $ */ 1/* $OpenBSD: version.h,v 1.50 2007/08/15 08:16:49 markus Exp $ */
2 2
3#define SSH_VERSION "OpenSSH_4.6" 3#define SSH_VERSION "OpenSSH_4.7"
4 4
5#define SSH_PORTABLE "p1" 5#define SSH_PORTABLE "p1"
6#define SSH_RELEASE SSH_VERSION SSH_PORTABLE 6#define SSH_RELEASE SSH_VERSION SSH_PORTABLE