summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2011-09-07 09:11:18 +1000
committerDamien Miller <djm@mindrot.org>2011-09-07 09:11:18 +1000
commit753a045ea4ad19d3586232e7df124000198bdc28 (patch)
treed17444ec68c795ac1d4ad91a903e687e570ba602
parente21c9c2094733fc4778688766cf8ea3c9b473aca (diff)
- (djm) [README version.h] Correct version
-rw-r--r--ChangeLog3
-rw-r--r--README4
-rwxr-xr-xcontrib/redhat/sshd.init8
-rw-r--r--version.h2
4 files changed, 10 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog
index f75aa563..1021f94c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+20110906
+ - (djm) [README version.h] Correct version
+
20110905
- (djm) [README contrib/caldera/openssh.spec contrib/redhat/openssh.spec]
[contrib/suse/openssh.spec] Update version numbers.
diff --git a/README b/README
index 093a3849..e26654b2 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-See http://www.openssh.com/txt/release-5.9p1 for the release notes.
+See http://www.openssh.com/txt/release-5.9 for the release notes.
- A Japanese translation of this document and of the OpenSSH FAQ is
- available at http://www.unixuser.org/~haruyama/security/openssh/index.html
@@ -62,4 +62,4 @@ References -
[6] http://www.openbsd.org/cgi-bin/man.cgi?query=style&sektion=9
[7] http://www.openssh.com/faq.html
-$Id: README,v 1.77.2.1 2011/09/05 00:27:58 djm Exp $
+$Id: README,v 1.77.2.2 2011/09/06 23:11:20 djm Exp $
diff --git a/contrib/redhat/sshd.init b/contrib/redhat/sshd.init
index 2334d814..e9a75179 100755
--- a/contrib/redhat/sshd.init
+++ b/contrib/redhat/sshd.init
@@ -40,10 +40,10 @@ start()
# Create keys if necessary
/usr/bin/ssh-keygen -A
if [ -x /sbin/restorecon ]; then
- /sbin/restorcon /etc/ssh/ssh_host_key.pub
- /sbin/restorcon /etc/ssh/ssh_host_rsa_key.pub
- /sbin/restorcon /etc/ssh/ssh_host_dsa_key.pub
- /sbin/restorcon /etc/ssh/ssh_host_ecdsa_key.pub
+ /sbin/restorecon /etc/ssh/ssh_host_key.pub
+ /sbin/restorecon /etc/ssh/ssh_host_rsa_key.pub
+ /sbin/restorecon /etc/ssh/ssh_host_dsa_key.pub
+ /sbin/restorecon /etc/ssh/ssh_host_ecdsa_key.pub
fi
echo -n $"Starting $prog:"
diff --git a/version.h b/version.h
index d3d57eab..6a1acb3b 100644
--- a/version.h
+++ b/version.h
@@ -2,5 +2,5 @@
#define SSH_VERSION "OpenSSH_5.9"
-#define SSH_PORTABLE "p2"
+#define SSH_PORTABLE "p1"
#define SSH_RELEASE SSH_VERSION SSH_PORTABLE