1 files changed, 18 insertions, 3 deletions

diff --git a/debian/openssh-client.postinst b/debian/openssh-client.postinst
index 2168dc1f1..4744a34a1 100644
--- a/debian/openssh-client.postinst
+++ b/debian/openssh-client.postinst
@@ -59,13 +59,28 @@ set_ssh_permissions() {
             fi
         fi
 
+        # libexecdir changed, so migrate old statoverrides.
+        if [ -x /usr/sbin/dpkg-statoverride ] &&
+            override="$(dpkg-statoverride --list /usr/lib/ssh-keysign)"; then
+                override_user="${override%% *}"
+                override="${override#* }"
+                override_group="${override%% *}"
+                override="${override#* }"
+                override_mode="${override%% *}"
+                if dpkg-statoverride --update --add \
+                    "$override_user" "$override_group" "$override_mode" \
+                    /usr/lib/openssh/ssh-keysign; then
+                        dpkg-statoverride --remove /usr/lib/ssh-keysign || true
+                fi
+        fi
+
         if [ ! -x /usr/sbin/dpkg-statoverride ] || \
-             ! dpkg-statoverride --list /usr/lib/ssh-keysign >/dev/null ; then
+             ! dpkg-statoverride --list /usr/lib/openssh/ssh-keysign >/dev/null; then
                 db_get ssh/SUID_client
                 if [ "$RET" = "false" ] ; then
-                        chmod 0755 /usr/lib/ssh-keysign
+                        chmod 0755 /usr/lib/openssh/ssh-keysign
                 elif [ "$RET" = "true" ] ; then
-                        chmod 4755 /usr/lib/ssh-keysign
+                        chmod 4755 /usr/lib/openssh/ssh-keysign
                 fi
         fi
 }