* Move /etc/pam.d/ssh to /etc/pam.d/sshd, allowing us to stop defining

  SSHD_PAM_SERVICE (closes: #255870).

1 files changed, 14 insertions, 0 deletions

diff --git a/debian/openssh-server.postinst b/debian/openssh-server.postinst
index 61d34d281..ed7590c87 100644
--- a/debian/openssh-server.postinst
+++ b/debian/openssh-server.postinst
@@ -372,6 +372,19 @@ commit_transfer_conffile () {
         fi
 }
 
+commit_mv_conffile () {
+        OLDCONFFILE="$1"
+        NEWCONFFILE="$2"
+
+        if [ -e "$OLDCONFFILE.moving" ]; then
+                echo "Preserving user changes to $NEWCONFFILE ..."
+                mv -f "$NEWCONFFILE" "$NEWCONFFILE.dpkg-new"
+                mv -f "$OLDCONFFILE.moving" "$NEWCONFFILE"
+        elif [ -e "$OLDCONFFILE.dpkg-old" ]; then
+                rm -f "$OLDCONFFILE.dpkg-old"
+        fi
+}
+
 
 fix_doc_symlink
 create_sshdconfig
@@ -392,6 +405,7 @@ setup_init
 commit_transfer_conffile /etc/default/ssh
 commit_transfer_conffile /etc/init.d/ssh
 commit_transfer_conffile /etc/pam.d/ssh
+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