3 files changed, 5 insertions, 6 deletions

diff --git a/debian/changelog b/debian/changelog
index 0b2c19fb5..484251596 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ openssh (1:6.7p1-3) UNRELEASED; urgency=medium
 
   * Debconf translations:
     - Dutch (thanks, Frans Spiesschaert; closes: #765851).
+  * Assume that dpkg-statoverride exists and drop the test for an obsolete
+    compatibility path.
 
  -- Colin Watson <cjwatson@debian.org>  Sun, 19 Oct 2014 06:07:21 +0100
 
diff --git a/debian/openssh-client.postinst b/debian/openssh-client.postinst
index 978b04a9b..ec0ad2b2b 100644
--- a/debian/openssh-client.postinst
+++ b/debian/openssh-client.postinst
@@ -28,8 +28,7 @@ set_ssh_agent_permissions() {
         if ! getent group ssh >/dev/null; then
                 addgroup --system --quiet ssh
         fi
-        if ! [ -x /usr/sbin/dpkg-statoverride ] || \
-            ! dpkg-statoverride --list /usr/bin/ssh-agent >/dev/null ; then
+        if ! dpkg-statoverride --list /usr/bin/ssh-agent >/dev/null; then
                 chgrp ssh /usr/bin/ssh-agent
                 chmod 2755 /usr/bin/ssh-agent
         fi
diff --git a/debian/openssh-server.postinst b/debian/openssh-server.postinst
index cf6e312fe..5131b2647 100644
--- a/debian/openssh-server.postinst
+++ b/debian/openssh-server.postinst
@@ -265,10 +265,8 @@ EOF
 
 fix_statoverride() {
 # Remove an erronous override for sshd (we should have overridden ssh)
-        if [ -x /usr/sbin/dpkg-statoverride ]; then
-                if dpkg-statoverride --list /usr/sbin/sshd >/dev/null ; then
-                        dpkg-statoverride --remove /usr/sbin/sshd
-                fi
+        if dpkg-statoverride --list /usr/sbin/sshd >/dev/null; then
+                dpkg-statoverride --remove /usr/sbin/sshd
         fi
 }