summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--version.h6
2 files changed, 7 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index ab40e629b..ae8db7fd9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -23,6 +23,9 @@
23 [sshconnect2.c] 23 [sshconnect2.c]
24 Fix regression where SSH2 banner is printed at loglevels ERROR and FATAL 24 Fix regression where SSH2 banner is printed at loglevels ERROR and FATAL
25 where previously it weren't. bz #1221, found by Dean Kopesky, ok djm@ 25 where previously it weren't. bz #1221, found by Dean Kopesky, ok djm@
26 - djm@cvs.openbsd.org 2006/08/30 00:14:37
27 [version.h]
28 crank to 4.4
26 29
2720060824 3020060824
28 - (dtucker) [openbsd-compat/basename.c] Include errno.h. 31 - (dtucker) [openbsd-compat/basename.c] Include errno.h.
@@ -5325,4 +5328,4 @@
5325 - (djm) Trim deprecated options from INSTALL. Mention UsePAM 5328 - (djm) Trim deprecated options from INSTALL. Mention UsePAM
5326 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu 5329 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
5327 5330
5328$Id: ChangeLog,v 1.4515 2006/08/30 01:08:33 djm Exp $ 5331$Id: ChangeLog,v 1.4516 2006/08/30 01:09:01 djm Exp $
diff --git a/version.h b/version.h
index d5fd0c6ce..363e510ba 100644
--- a/version.h
+++ b/version.h
@@ -1,6 +1,6 @@
1/* $OpenBSD: version.h,v 1.46 2006/02/01 11:27:22 markus Exp $ */ 1/* $OpenBSD: version.h,v 1.47 2006/08/30 00:14:37 djm Exp $ */
2 2
3#define SSH_VERSION "OpenSSH_4.3" 3#define SSH_VERSION "OpenSSH_4.4"
4 4
5#define SSH_PORTABLE "p2" 5#define SSH_PORTABLE "p1"
6#define SSH_RELEASE SSH_VERSION SSH_PORTABLE 6#define SSH_RELEASE SSH_VERSION SSH_PORTABLE