2 files changed, 9 insertions, 0 deletions

diff --git a/debian/changelog b/debian/changelog
index 61bbb4234..35406d56f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ openssh (1:4.1p1-7) UNRELEASED; urgency=low
 
   * Do the IDEA host key check on a temporary file to avoid altering
     /etc/ssh/ssh_host_key itself (closes: #312312).
+  * Work around the ssh-askpass alternative somehow ending up in manual mode
+    pointing to the obsolete /usr/lib/ssh/gnome-ssh-askpass.
 
  -- Colin Watson <cjwatson@debian.org>  Sat,  9 Jul 2005 23:59:38 +0100
 
diff --git a/debian/ssh-askpass-gnome.postinst b/debian/ssh-askpass-gnome.postinst
index 15290b711..b6c56d4e7 100644
--- a/debian/ssh-askpass-gnome.postinst
+++ b/debian/ssh-askpass-gnome.postinst
@@ -29,6 +29,13 @@ case "$1" in
             update-alternatives --quiet --remove ssh-askpass \
                 /usr/lib/ssh/gnome-ssh-askpass
         fi
+        if dpkg --compare-versions "$2" lt-nl 1:4.1p1-7 && \
+                [ -h /etc/alternatives/ssh-askpass ] && \
+                [ "$(readlink /etc/alternatives/ssh-askpass)" = /usr/lib/ssh/gnome-ssh-askpass ]; then
+            # Work around the ssh-askpass alternative somehow ending up in
+            # manual mode.
+            update-alternatives --auto ssh-askpass
+        fi
         update-alternatives --quiet \
             --install /usr/bin/ssh-askpass ssh-askpass \
                       /usr/lib/openssh/gnome-ssh-askpass 30 \