3 files changed, 32 insertions, 33 deletions

diff --git a/debian/changelog b/debian/changelog
index 7e32bad3b..acbde46f9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -17,6 +17,8 @@ openssh (1:6.2p2-2) UNRELEASED; urgency=low
   * Remove support for upgrading directly from ssh-nonfree.
   * Remove lots of maintainer script support for direct upgrades from
     pre-etch (three releases before current stable).
+  * Add #DEBHELPER# tokens to openssh-client.postinst and
+    openssh-server.postinst.
 
  -- Colin Watson <cjwatson@debian.org>  Tue, 21 May 2013 17:49:35 +0100
 
diff --git a/debian/openssh-client.postinst b/debian/openssh-client.postinst
index d752d01c9..85cedc406 100644
--- a/debian/openssh-client.postinst
+++ b/debian/openssh-client.postinst
@@ -5,11 +5,6 @@ oldversion="$2"
 
 umask 022
 
-if [ "$action" != configure ]
-  then
-  exit 0
-fi
-
 
 create_alternatives() {
 # Create alternatives for the various r* tools.
@@ -40,7 +35,11 @@ set_ssh_agent_permissions() {
 }
 
 
-create_alternatives
-set_ssh_agent_permissions
+if [ "$action" = configure ]; then
+        create_alternatives
+        set_ssh_agent_permissions
+fi
+
+#DEBHELPER#
 
 exit 0
diff --git a/debian/openssh-server.postinst.in b/debian/openssh-server.postinst.in
index 245333234..a91ec082a 100644
--- a/debian/openssh-server.postinst.in
+++ b/debian/openssh-server.postinst.in
@@ -8,11 +8,6 @@ db_version 2.0
 
 umask 022
 
-if [ "$action" != configure ]
-  then
-  exit 0
-fi
-
 
 get_config_option() {
         option="$1"
@@ -339,29 +334,32 @@ commit_mv_conffile () {
 }
 
 
-create_sshdconfig
-create_keys
-vulnerable_host_keys
-fix_statoverride
-setup_sshd_user
-if dpkg --compare-versions "$2" lt 1:5.2p1-1; then
-    remove_old_init_links
-fi
-setup_init
-commit_mv_conffile /etc/pam.d/ssh /etc/pam.d/sshd
-# Renamed to /etc/ssh/moduli in 2.9.9 (!)
-if dpkg --compare-versions "$2" lt 1:4.7p1-1; then
-    rm -f /etc/ssh/primes
-fi
-if dpkg --compare-versions "$2" lt 1:5.5p1-6; then
-    rm -f /var/run/sshd/.placeholder
-fi
+if [ "$action" = configure ]; then
+        create_sshdconfig
+        create_keys
+        vulnerable_host_keys
+        fix_statoverride
+        setup_sshd_user
+        if dpkg --compare-versions "$2" lt 1:5.2p1-1; then
+            remove_old_init_links
+        fi
+        setup_init
+        commit_mv_conffile /etc/pam.d/ssh /etc/pam.d/sshd
+        # Renamed to /etc/ssh/moduli in 2.9.9 (!)
+        if dpkg --compare-versions "$2" lt 1:4.7p1-1; then
+            rm -f /etc/ssh/primes
+        fi
+        if dpkg --compare-versions "$2" lt 1:5.5p1-6; then
+            rm -f /var/run/sshd/.placeholder
+        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
+        # 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
+fi
 
+#DEBHELPER#
 
 db_stop