1 files changed, 0 insertions, 60 deletions

diff --git a/debian/openssh-client.postinst b/debian/openssh-client.postinst
index 2f884b7b7..d752d01c9 100644
--- a/debian/openssh-client.postinst
+++ b/debian/openssh-client.postinst
@@ -3,9 +3,6 @@
 action="$1"
 oldversion="$2"
 
-. /usr/share/debconf/confmodule
-db_version 2.0
-
 umask 022
 
 if [ "$action" != configure ]
@@ -14,25 +11,6 @@ if [ "$action" != configure ]
 fi
 
 
-fix_rsh_diversion() {
-# get rid of mistaken rsh diversion (circa 1.2.27-1)
-
-        if [ -L /usr/bin/rsh ] &&
-                dpkg-divert --list '/usr/bin/rsh.real/rsh' | grep -q ' ssh$' ; then
-                for cmd in rlogin  rsh rcp ; do
-                        [ -L /usr/bin/$cmd ] && rm /usr/bin/$cmd
-                        dpkg-divert --package ssh --remove --rename \
-                                --divert /usr/bin/rsh.real/$cmd /usr/bin/$cmd
-
-                        [ -L /usr/man/man1/$cmd.1.gz ] && rm /usr/man/man1/$$cmd.1.gz
-                        dpkg-divert --package ssh --remove --rename \
-                                --divert /usr/man/man1/$cmd.real.1.gz /usr/man/man1/$cmd.1.gz
-                done
-
-                rmdir /usr/bin/rsh.real
-        fi
-}
-
 create_alternatives() {
 # Create alternatives for the various r* tools.
 # Make sure we don't change existing alternatives that a user might have
@@ -50,39 +28,6 @@ create_alternatives() {
         done
 }
 
-set_ssh_permissions() {
-        if dpkg --compare-versions "$oldversion" lt-nl 1:3.4p1-1 ; then
-            if [ -x /usr/sbin/dpkg-statoverride ] ; then
-                if dpkg-statoverride --list /usr/bin/ssh >/dev/null; then
-                    dpkg-statoverride --remove /usr/bin/ssh >/dev/null
-                fi 
-            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
-}
-
-fix_ssh_group() {
-        # Try to remove non-system group mistakenly created by 1:3.5p1-1.
-        # set_ssh_agent_permissions() below will re-create it properly.
-        if getent group ssh >/dev/null; then
-                delgroup --quiet ssh || true
-        fi
-}
-
 set_ssh_agent_permissions() {
         if ! getent group ssh >/dev/null; then
                 addgroup --system --quiet ssh
@@ -95,12 +40,7 @@ set_ssh_agent_permissions() {
 }
 
 
-fix_rsh_diversion
 create_alternatives
-set_ssh_permissions
-if [ "$2" = "1:3.5p1-1" ]; then
-    fix_ssh_group
-fi
 set_ssh_agent_permissions
 
 exit 0