summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2010-03-08 09:03:33 +1100
committerDamien Miller <djm@mindrot.org>2010-03-08 09:03:33 +1100
commitb3bc331e09c7b3617579a53980ca59feb99a8dd2 (patch)
tree8755ba5f5128e9ba42be9188eb72ba652a462769
parentcd70e1b8137023539df57b175b733341d8f4d776 (diff)
- (djm) OpenBSD CVS Sync
- djm@cvs.openbsd.org 2010/03/07 22:01:32 [version.h] openssh-5.4
-rw-r--r--ChangeLog6
-rw-r--r--version.h4
2 files changed, 8 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 9afd093eb..0b26749a1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,10 @@
120100307 120100307
2 - (djm) OpenBSD CVS Sync
3 - djm@cvs.openbsd.org 2010/03/07 22:01:32
4 [version.h]
5 openssh-5.4
6
720100307
2 - (dtucker) [auth.c] Bug #1710: call setauthdb on AIX before getpwuid so that 8 - (dtucker) [auth.c] Bug #1710: call setauthdb on AIX before getpwuid so that
3 it gets the passwd struct from the LAM that knows about the user which is 9 it gets the passwd struct from the LAM that knows about the user which is
4 not necessarily the default. Patch from Alexandre Letourneau. 10 not necessarily the default. Patch from Alexandre Letourneau.
diff --git a/version.h b/version.h
index 721ebdea0..c604c753c 100644
--- a/version.h
+++ b/version.h
@@ -1,6 +1,6 @@
1/* $OpenBSD: version.h,v 1.56 2009/06/30 14:54:40 markus Exp $ */ 1/* $OpenBSD: version.h,v 1.57 2010/03/07 22:01:32 djm Exp $ */
2 2
3#define SSH_VERSION "OpenSSH_5.3" 3#define SSH_VERSION "OpenSSH_5.4"
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