2 files changed, 34 insertions, 0 deletions

diff --git a/debian/changelog b/debian/changelog
index c46405b33..139e9604a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 openssh (1:4.7p1-8) UNRELEASED; urgency=low
 
   * Fill in CVE identifier for security vulnerability fixed in 1:4.7p1-5.
+  * Rename KeepAlive to TCPKeepAlive in sshd_config, cleaning up from old
+    configurations (LP: #211400).
 
  -- Colin Watson <cjwatson@debian.org>  Tue, 01 Apr 2008 14:12:43 +0100
 
diff --git a/debian/openssh-server.postinst b/debian/openssh-server.postinst
index ed7590c87..1d26a7b55 100644
--- a/debian/openssh-server.postinst
+++ b/debian/openssh-server.postinst
@@ -97,6 +97,32 @@ disable_config_option() {
 }
 
 
+rename_config_option() {
+        oldoption="$1"
+        newoption="$2"
+
+        value="$(get_config_option "$oldoption")"
+        [ "$value" ] || return 0
+
+        perl -le '
+                $oldoption = $ARGV[0]; $newoption = $ARGV[1];
+                while (<STDIN>) {
+                        chomp;
+                        (my $match = $_) =~ s/\s+/ /g;
+                        # TODO: actually only one "=" allowed after option
+                        if ($match =~ s/^(\s*)\Q$oldoption\E([[:space:]=]+)/$1$newoption$2/i) {
+                                $_ = $match;
+                        }
+                        print;
+                }' \
+                "$oldoption" "$newoption" \
+                < /etc/ssh/sshd_config > /etc/ssh/sshd_config.dpkg-new
+        chown --reference /etc/ssh/sshd_config /etc/ssh/sshd_config.dpkg-new
+        chmod --reference /etc/ssh/sshd_config /etc/ssh/sshd_config.dpkg-new
+        mv /etc/ssh/sshd_config.dpkg-new /etc/ssh/sshd_config
+}
+
+
 remove_obsolete_gssapi() {
         disable_config_option GSSAPINoMICAuthentication
         disable_config_option GSSUseSessionCCache
@@ -227,6 +253,12 @@ create_sshdconfig() {
                     remove_obsolete_gssapi
                 fi
 
+                # This option was renamed in 3.8p1, but we never took care
+                # of adjusting the configuration file until now.
+                if dpkg --compare-versions "$oldversion" lt 1:4.7p1-8; then
+                    rename_config_option KeepAlive TCPKeepAlive
+                fi
+
                 return 0
             fi
         fi