summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorColin Watson <cjwatson@debian.org>2007-03-05 16:13:46 +0000
committerColin Watson <cjwatson@debian.org>2007-03-05 16:13:46 +0000
commit0204bf70b929a9c82a343afc98b7f14f24f050e2 (patch)
tree9cb9e4487bfa233de324426ba32fe488e0d2153e
parentc5627b7bccd3e376e766678340bd445ab6520de2 (diff)
* Fix uncommenting of GSSAPI options by ssh-krb5 (closes: #407766).
-rw-r--r--debian/changelog1
-rw-r--r--debian/ssh-krb5.postinst2
2 files changed, 2 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index 555b49d80..94a2a58c8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ openssh (1:4.3p2-9) UNRELEASED; urgency=low
3 [ Russ Allbery ] 3 [ Russ Allbery ]
4 * Fix GSSAPIKeyExchange configuration file handling logic in ssh-krb5 4 * Fix GSSAPIKeyExchange configuration file handling logic in ssh-krb5
5 (closes: #404863). 5 (closes: #404863).
6 * Fix uncommenting of GSSAPI options by ssh-krb5 (closes: #407766).
6 7
7 [ Colin Watson ] 8 [ Colin Watson ]
8 * debconf template translations: 9 * debconf template translations:
diff --git a/debian/ssh-krb5.postinst b/debian/ssh-krb5.postinst
index 89ef8d86e..4d943d861 100644
--- a/debian/ssh-krb5.postinst
+++ b/debian/ssh-krb5.postinst
@@ -42,7 +42,7 @@ EOF
42 else 42 else
43 changed=true 43 changed=true
44 if grep -qi '^#GSSAPI' /etc/ssh/sshd_config ; then 44 if grep -qi '^#GSSAPI' /etc/ssh/sshd_config ; then
45 perl -pe 's/^\#(GSSAPI(Authentication|KeyExchange))\b/$1/i' \ 45 perl -pe 's/^\#(GSSAPI(Authentication|KeyExchange))\b.*/$1 yes/i' \
46 < /etc/ssh/sshd_config > /etc/ssh/sshd_config.dpkg-new 46 < /etc/ssh/sshd_config > /etc/ssh/sshd_config.dpkg-new
47 chown --reference /etc/ssh/sshd_config \ 47 chown --reference /etc/ssh/sshd_config \
48 /etc/ssh/sshd_config.dpkg-new 48 /etc/ssh/sshd_config.dpkg-new