[Pkg-sssd-devel] sssd: Changes to 'ubuntu-precise'

[Timo Aaltonen]

 debian/changelog                           |    8 ++++++++
 debian/libpam-sss.pam-auth-update          |    5 +++++
 debian/libpam-sss.pam-auth-update-password |    9 ---------
 debian/rules                               |    2 --
 4 files changed, 13 insertions(+), 11 deletions(-)

New commits:
commit 6fca8d7cc7be8beb592bc44aafda5e026e2fc889
Author: Timo Aaltonen <tjaalton at ubuntu.com>
Date:   Fri Sep 13 11:40:24 2013 +0300

    Revert the pam password stack change, there's no way to fix it properly for every use case without adding new dependencies. (LP: #1159983)

diff --git a/debian/changelog b/debian/changelog
index d830048..514c87b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+sssd (1.8.6-0ubuntu0.3) precise-proposed; urgency=low
+
+  * Revert the pam password stack change, there's no way to fix it
+    properly for every use case without adding new dependencies.
+    (LP: #1159983)
+
+ -- Timo Aaltonen <tjaalton at ubuntu.com>  Fri, 13 Sep 2013 11:36:12 +0300
+
 sssd (1.8.6-0ubuntu0.2) precise-proposed; urgency=low
 
   * rules: Really install the new pam-auth-update file for password
diff --git a/debian/libpam-sss.pam-auth-update b/debian/libpam-sss.pam-auth-update
index 7d719e4..c6948b8 100644
--- a/debian/libpam-sss.pam-auth-update
+++ b/debian/libpam-sss.pam-auth-update
@@ -11,6 +11,11 @@ Account-Type: Additional
 Account:
 	sufficient					pam_localuser.so
 	[default=bad success=ok user_unknown=ignore]	pam_sss.so
+Password-Type: Primary
+Password:
+	sufficient					pam_sss.so
+Password-Initial:
+	sufficient					pam_sss.so
 Session-Type: Additional
 Session-Interactive-Only: yes
 Session:
diff --git a/debian/libpam-sss.pam-auth-update-password b/debian/libpam-sss.pam-auth-update-password
deleted file mode 100644
index 7c3f221..0000000
--- a/debian/libpam-sss.pam-auth-update-password
+++ /dev/null
@@ -1,9 +0,0 @@
-Name: SSS password change
-Default: yes
-Priority: 512
-
-Password-Type: Primary
-Password:
-	sufficient					pam_sss.so use_authtok
-Password-Initial:
-	sufficient					pam_sss.so
diff --git a/debian/rules b/debian/rules
index db31657..3237512 100755
--- a/debian/rules
+++ b/debian/rules
@@ -32,8 +32,6 @@ override_dh_install:
 	mkdir -p $(CURDIR)/debian/libpam-sss/usr/share/pam-configs
 	install -m644 debian/libpam-sss.pam-auth-update \
 		$(CURDIR)/debian/libpam-sss/usr/share/pam-configs/sss
-	install -m644 debian/libpam-sss.pam-auth-update-password \
-		$(CURDIR)/debian/libpam-sss/usr/share/pam-configs/sss-password
 
 	cat $(CURDIR)/debian/sssd.$(INIT).in > $(CURDIR)/debian/sssd.$(INIT)