summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorColin Watson <cjwatson@debian.org>2004-04-20 07:53:33 +0000
committerColin Watson <cjwatson@debian.org>2004-04-20 07:53:33 +0000
commitf52ab6479f10e716d61a5a07773b471ecd35dc9f (patch)
treeeb4478766c09214904ff52ae26e9e15779351aeb
parent5c3eae80f9a16ca71c76d46ae9e5c5227ae2106f (diff)
Make sure there's a newline at the end of sshd_config before adding 'UsePAM
yes' (closes: #244829).
-rw-r--r--debian/changelog7
-rw-r--r--debian/postinst1
2 files changed, 8 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index 724b4b593..1d7abfdf3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
1openssh (1:3.8p1-4) UNRELEASED; urgency=low
2
3 * Make sure there's a newline at the end of sshd_config before adding
4 'UsePAM yes' (closes: #244829).
5
6 -- Colin Watson <cjwatson@debian.org> Tue, 20 Apr 2004 08:48:53 +0100
7
1openssh (1:3.8p1-3) unstable; urgency=low 8openssh (1:3.8p1-3) unstable; urgency=low
2 9
3 * Remove deprecated ReverseMappingCheck option from newly generated 10 * Remove deprecated ReverseMappingCheck option from newly generated
diff --git a/debian/postinst b/debian/postinst
index cab39d9b2..b641769ba 100644
--- a/debian/postinst
+++ b/debian/postinst
@@ -68,6 +68,7 @@ create_sshdconfig() {
68 cp -a /etc/ssh/sshd_config /etc/ssh/sshd_config.dpkg-old 68 cp -a /etc/ssh/sshd_config /etc/ssh/sshd_config.dpkg-old
69 perl -pe 's/^(PAMAuthenticationViaKbdInt|RhostsAuthentication)\b/#$1/i' \ 69 perl -pe 's/^(PAMAuthenticationViaKbdInt|RhostsAuthentication)\b/#$1/i' \
70 /etc/ssh/sshd_config > /etc/ssh/sshd_config.dpkg-new 70 /etc/ssh/sshd_config > /etc/ssh/sshd_config.dpkg-new
71 echo >> /etc/ssh/sshd_config.dpkg-new
71 echo 'UsePAM yes' >> /etc/ssh/sshd_config.dpkg-new 72 echo 'UsePAM yes' >> /etc/ssh/sshd_config.dpkg-new
72 mv /etc/ssh/sshd_config.dpkg-new /etc/ssh/sshd_config 73 mv /etc/ssh/sshd_config.dpkg-new /etc/ssh/sshd_config
73 echo 74 echo