4 files changed, 12 insertions, 3 deletions

diff --git a/debian/changelog b/debian/changelog
index 66d8c7a3c..cdf177bc0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 openssh (1:6.6p1-6) UNRELEASED; urgency=medium
 
   * Upgrade to debhelper v9.
+  * Only use pam_keyinit on Linux architectures (closes: #747245).
 
  -- Colin Watson <cjwatson@debian.org>  Mon, 26 May 2014 09:23:51 +0100
 
diff --git a/debian/clean b/debian/clean
index 5da17f8eb..fcd68b77e 100644
--- a/debian/clean
+++ b/debian/clean
@@ -1 +1,2 @@
 config.log
+debian/openssh-server.sshd.pam
diff --git a/debian/openssh-server.sshd.pam b/debian/openssh-server.sshd.pam.in
index 7978b0c64..bbc3dba97 100644
--- a/debian/openssh-server.sshd.pam
+++ b/debian/openssh-server.sshd.pam.in
@@ -21,8 +21,8 @@ session [success=ok ignore=ignore module_unknown=ignore default=bad]        pam_
 # Set the loginuid process attribute.
 session    required     pam_loginuid.so
 
-# Create a new session keyring.
-session    optional     pam_keyinit.so force revoke
+@IF_KEYINIT@# Create a new session keyring.
+@IF_KEYINIT@session    optional     pam_keyinit.so force revoke
 
 # Standard Un*x session setup and teardown.
 @include common-session
diff --git a/debian/rules b/debian/rules
index b85a8bc7e..f4d010377 100755
--- a/debian/rules
+++ b/debian/rules
@@ -200,7 +200,14 @@ override_dh_systemd_enable:
 override_dh_installinit:
         dh_installinit -R --name ssh
 
-override_dh_installpam:
+debian/openssh-server.sshd.pam: debian/openssh-server.sshd.pam.in
+ifeq ($(DEB_HOST_ARCH_OS),linux)
+        sed 's/^@IF_KEYINIT@//' $< > $@
+else
+        sed '/^@IF_KEYINIT@/d' $< > $@
+endif
+
+override_dh_installpam: debian/openssh-server.sshd.pam
         dh_installpam --name sshd
 
 override_dh_fixperms: