1 files changed, 1 insertions, 122 deletions

diff --git a/debian/openssh-server.postinst.in b/debian/openssh-server.postinst.in
index 7ef270d80..245333234 100644
--- a/debian/openssh-server.postinst.in
+++ b/debian/openssh-server.postinst.in
@@ -14,15 +14,6 @@ if [ "$action" != configure ]
 fi
 
 
-fix_doc_symlink() {
-        if [ ! -L /usr/share/doc/openssh-server ] && \
-           dpkg --compare-versions "$oldversion" lt-nl 1:4.1p1-5; then
-                rm -rf /usr/share/doc/openssh-server
-                ln -s openssh-client /usr/share/doc/openssh-server
-        fi
-}
-
-
 get_config_option() {
         option="$1"
 
@@ -58,31 +49,6 @@ set_config_option() {
 }
 
 
-disable_config_option() {
-        option="$1"
-
-        value="$(get_config_option "$option")"
-        [ "$value" ] || return 0
-
-        perl -le '
-                $option = $ARGV[0];
-                while (<STDIN>) {
-                        chomp;
-                        (my $match = $_) =~ s/\s+/ /g;
-                        # TODO: actually only one "=" allowed after option
-                        if ($match =~ s/^(\s*\Q$option\E[[:space:]=]+.*)/#$1/i) {
-                                $_ = $match;
-                        }
-                        print;
-                }' \
-                "$option" \
-                < /etc/ssh/sshd_config > /etc/ssh/sshd_config.dpkg-new
-        chown --reference /etc/ssh/sshd_config /etc/ssh/sshd_config.dpkg-new
-        chmod --reference /etc/ssh/sshd_config /etc/ssh/sshd_config.dpkg-new
-        mv /etc/ssh/sshd_config.dpkg-new /etc/ssh/sshd_config
-}
-
-
 rename_config_option() {
         oldoption="$1"
         newoption="$2"
@@ -109,13 +75,6 @@ rename_config_option() {
 }
 
 
-remove_obsolete_gssapi() {
-        disable_config_option GSSAPINoMICAuthentication
-        disable_config_option GSSUseSessionCCache
-        disable_config_option GSSAPIUseSessionCredCache
-}
-
-
 host_keys_required() {
         hostkeys="$(get_config_option HostKey)"
         if [ "$hostkeys" ]; then
@@ -201,28 +160,6 @@ vulnerable_host_keys() {
 }
 
 
-check_password_auth() {
-        passwordauth="$(get_config_option PasswordAuthentication)"
-        crauth="$(get_config_option ChallengeResponseAuthentication)"
-        if [ "$passwordauth" = no ] && \
-           ([ -z "$crauth" ] || [ "$crauth" = yes ]); then
-                db_get ssh/disable_cr_auth
-                if [ "$RET" = true ]; then
-                        set_config_option ChallengeResponseAuthentication no
-                fi
-        fi
-}
-
-
-move_subsystem_sftp() {
-        subsystem_sftp="$(get_config_option 'Subsystem sftp')"
-        if [ "$subsystem_sftp" = /usr/lib/sftp-server ] || \
-           [ "$subsystem_sftp" = /usr/libexec/sftp-server ]; then
-                set_config_option 'Subsystem sftp' /usr/lib/openssh/sftp-server
-        fi
-}
-
-
 fix_loglevel_silent() {
         if [ "$(get_config_option LogLevel)" = SILENT ]; then
                 set_config_option LogLevel QUIET
@@ -234,46 +171,6 @@ create_sshdconfig() {
         if [ -e /etc/ssh/sshd_config ] ; then
             # Upgrade an existing sshd configuration.
 
-            if (dpkg --compare-versions "$oldversion" lt-nl 1:3.8p1-1 && \
-                ! grep -iq ^UsePAM /etc/ssh/sshd_config) || \
-               grep -Eiq '^(PAMAuthenticationViaKbdInt|RhostsAuthentication)' \
-                 /etc/ssh/sshd_config ; then
-                # Upgrade from pre-3.7: UsePAM needed to maintain standard
-                # Debian configuration.
-                # Note that --compare-versions is sadly not reliable enough
-                # here due to the package split of ssh into openssh-client
-                # and openssh-server. The extra grep for some deprecated
-                # options should with any luck be a good enough heuristic.
-                echo -n 'Upgrading sshd_config (old version in .dpkg-old) ...'
-                cp -a /etc/ssh/sshd_config /etc/ssh/sshd_config.dpkg-old
-                perl -pe 's/^(PAMAuthenticationViaKbdInt|RhostsAuthentication)\b/#$1/i' \
-                    /etc/ssh/sshd_config > /etc/ssh/sshd_config.dpkg-new
-                echo >> /etc/ssh/sshd_config.dpkg-new
-                echo 'UsePAM yes' >> /etc/ssh/sshd_config.dpkg-new
-                chown --reference /etc/ssh/sshd_config \
-                                  /etc/ssh/sshd_config.dpkg-new
-                chmod --reference /etc/ssh/sshd_config \
-                                  /etc/ssh/sshd_config.dpkg-new
-                mv /etc/ssh/sshd_config.dpkg-new /etc/ssh/sshd_config
-                echo
-            fi
-
-            # An empty version means we're upgrading from before the
-            # package split, so check.
-            if dpkg --compare-versions "$oldversion" lt 1:3.8.1p1-11; then
-                check_password_auth
-            fi
-
-            # libexecdir changed, so fix up 'Subsystem sftp'.
-            if dpkg --compare-versions "$oldversion" lt 1:4.1p1-1; then
-                move_subsystem_sftp
-            fi
-
-            # Remove obsolete GSSAPI options.
-            if dpkg --compare-versions "$oldversion" lt 1:4.3p2-8; then
-                remove_obsolete_gssapi
-            fi
-
             # This option was renamed in 3.8p1, but we never took care
             # of adjusting the configuration file until now.
             if dpkg --compare-versions "$oldversion" lt 1:4.7p1-8; then
@@ -388,24 +285,12 @@ fix_statoverride() {
         fi
 }
 
-fix_sshd_shell() {
-        if getent passwd sshd | grep -q ':/bin/false$'; then
-                usermod -s /usr/sbin/nologin sshd || true
-        fi
-}
-
 setup_sshd_user() {
         if ! getent passwd sshd >/dev/null; then
                 adduser --quiet --system --no-create-home --home /var/run/sshd --shell /usr/sbin/nologin sshd
         fi
 }
 
-fix_conffile_permissions() {
-        # Clean up after executable /etc/default/ssh in 1:3.5p1-5. dpkg
-        # doesn't do this for us; see bug #192981.
-        chmod 644 /etc/default/ssh
-}
-
 remove_old_init_links() {
         # Yes, this only works with the SysV init script layout. I know.
         # The important thing is that it doesn't actually *break* with
@@ -454,18 +339,11 @@ commit_mv_conffile () {
 }
 
 
-fix_doc_symlink
 create_sshdconfig
 create_keys
 vulnerable_host_keys
 fix_statoverride
-if dpkg --compare-versions "$2" lt 1:4.3p2-3; then
-    fix_sshd_shell
-fi
 setup_sshd_user
-if dpkg --compare-versions "$2" lt 1:3.6.1p2-2; then
-    fix_conffile_permissions
-fi
 if dpkg --compare-versions "$2" lt 1:5.2p1-1; then
     remove_old_init_links
 fi
@@ -482,6 +360,7 @@ fi
 # Clean up old debconf templates.
 db_unregister ssh/use_old_init_script
 db_unregister ssh/encrypted_host_key_but_no_keygen
+db_unregister ssh/disable_cr_auth
 
 
 db_stop