Debian release 3.6.1p2-1.

1 files changed, 18 insertions, 42 deletions

diff --git a/debian/postinst b/debian/postinst
index 4d3598a31..8a1c7c588 100644
--- a/debian/postinst
+++ b/debian/postinst
@@ -3,10 +3,8 @@
 action="$1"
 oldversion="$2"
 
-test -e /usr/share/debconf/confmodule && {
-  . /usr/share/debconf/confmodule
-    db_version 2.0
-}
+. /usr/share/debconf/confmodule
+db_version 2.0
 
 umask 022
 
@@ -44,11 +42,7 @@ create_key() {
 
 
 create_keys() {
-        RET=true
-        test -e /usr/share/debconf/confmodule && {
-                db_get ssh/protocol2_only
-        }
-
+        db_get ssh/protocol2_only
         if [ "$RET" = "false" ] ; then
                 create_key "Creating SSH1 key; this may take some time ..." \
                         /etc/ssh/ssh_host_key -t rsa1
@@ -64,18 +58,11 @@ create_keys() {
 create_sshdconfig() {
         if [ -e /etc/ssh/sshd_config ] ; then
             if dpkg --compare-versions "$oldversion" lt-nl 1:1.3 ; then
-                RET=true
-                test -e /usr/share/debconf/confmodule && {
-                    db_get ssh/new_config
-                }
+                db_get ssh/new_config
                 if [ "$RET" = "false" ] ; then return 0; fi
             else return 0
             fi
         fi
-        RET=true
-        test -e /usr/share/debconf/confmodule && {
-                db_get ssh/protocol2_only
-        }
 
         #Preserve old sshd_config before generating a new on
         if [ -e /etc/ssh/sshd_config ] ; then 
@@ -92,6 +79,7 @@ Port 22
 #ListenAddress ::
 #ListenAddress 0.0.0.0
 EOF
+        db_get ssh/protocol2_only
 if [ "$RET" = "false" ]; then
                 cat <<EOF >> /etc/ssh/sshd_config
 Protocol 2,1
@@ -110,9 +98,7 @@ HostKey /etc/ssh/ssh_host_dsa_key
 EOF
 fi
 
-test -e /usr/share/debconf/confmodule && {
-    db_get ssh/privsep_ask
-}
+db_get ssh/privsep_ask
 if [ "$RET" = "false" ]; then
     cat <<EOF >> /etc/ssh/sshd_config
 #Explicitly set PrivSep off, as requested
@@ -166,8 +152,8 @@ HostbasedAuthentication no
 # To enable empty passwords, change to yes (NOT RECOMMENDED)
 PermitEmptyPasswords no
 
-# Uncomment to disable s/key passwords 
-#ChallengeResponseAuthentication no
+# Change to no to disable s/key passwords
+#ChallengeResponseAuthentication yes
 
 # To disable tunneled clear text passwords, change to no here!
 PasswordAuthentication yes
@@ -253,8 +239,6 @@ setup_sshd_user() {
 }
 
 set_sshd_permissions() {
-        suid=false
-
         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
@@ -263,17 +247,14 @@ set_sshd_permissions() {
             fi
         fi
 
-        [ -e /usr/share/debconf/confmodule ] && {
+        if [ ! -x /usr/sbin/dpkg-statoverride ] || \
+             ! dpkg-statoverride --list /usr/lib/ssh-keysign >/dev/null ; then
                 db_get ssh/SUID_client
-                suid="$RET"
-        }
-        if [ ! -x /usr/sbin/dpkg-statoverride ] || \
-             ! dpkg-statoverride --list /usr/lib/ssh-keysign >/dev/null ; then
-               if [ "$suid" = "false" ] ; then
-                       chmod 0755 /usr/lib/ssh-keysign
-               elif [ "$suid" = "true" ] ; then
-                       chmod 4755 /usr/lib/ssh-keysign
-               fi
+                if [ "$RET" = "false" ] ; then
+                        chmod 0755 /usr/lib/ssh-keysign
+                elif [ "$RET" = "true" ] ; then
+                        chmod 4755 /usr/lib/ssh-keysign
+                fi
         fi
 }
 
@@ -300,13 +281,8 @@ set_ssh_agent_permissions() {
 
 
 setup_startup() {
-        start=yes
-        [ -e /usr/share/debconf/confmodule ] && {
-                db_get ssh/run_sshd
-                start="$RET"
-        }
-
-        if [ "$start" != "true" ] ; then
+        db_get ssh/run_sshd
+        if [ "$RET" = "false" ] ; then
                 /etc/init.d/ssh stop 2>&1 >/dev/null
                 touch /etc/ssh/sshd_not_to_be_run
         else
@@ -336,7 +312,7 @@ setup_startup
 setup_init
 
 
-[ -e /usr/share/debconf/confmodule ] && db_stop
+db_stop
 
 exit 0