* Fix uncommenting of GSSAPI options by ssh-krb5 (closes: #407766).

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
   [ Russ Allbery ]
   * Fix GSSAPIKeyExchange configuration file handling logic in ssh-krb5
     (closes: #404863).
+  * Fix uncommenting of GSSAPI options by ssh-krb5 (closes: #407766).
 
   [ Colin Watson ]
   * 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
         else
             changed=true
             if grep -qi '^#GSSAPI' /etc/ssh/sshd_config ; then
-                perl -pe 's/^\#(GSSAPI(Authentication|KeyExchange))\b/$1/i' \
+                perl -pe 's/^\#(GSSAPI(Authentication|KeyExchange))\b.*/$1 yes/i' \
                     < /etc/ssh/sshd_config > /etc/ssh/sshd_config.dpkg-new
                 chown --reference /etc/ssh/sshd_config \
                     /etc/ssh/sshd_config.dpkg-new