[debian-edu-commits] debian-edu/ 01/02: Reinsert diverted /usr/share/pam-configs/krb5 and drop our override file now that bug #656309 is fixed.

[Petter Reinholdtsen]

This is an automated email from the git hooks/post-receive script.

pere pushed a commit to branch master
in repository debian-edu-config.

commit 9d6d6c44f212715590ed084cee5f3f189d34b902
Author: Petter Reinholdtsen <pere at hungry.com>
Date:   Thu Sep 11 19:55:02 2014 +0200

    Reinsert diverted /usr/share/pam-configs/krb5 and drop our
    override file now that bug #656309 is fixed.
---
 Makefile                                |  1 -
 cf/cf.krb5client                        | 14 --------------
 debian/changelog                        |  4 ++--
 debian/debian-edu-config.postinst       |  7 +++++++
 share/debian-edu-config/pam-config-krb5 | 15 ---------------
 5 files changed, 9 insertions(+), 32 deletions(-)

diff --git a/Makefile b/Makefile
index dafd59f..890db02 100644
--- a/Makefile
+++ b/Makefile
@@ -450,7 +450,6 @@ install: install-testsuite
 		share/debian-edu-config/pam-config-ccreds-check \
 		share/debian-edu-config/pam-config-ccreds-save \
 		share/debian-edu-config/pam-config-mkhomedir \
-		share/debian-edu-config/pam-config-krb5 \
 	; do \
 		$(INSTALL_DATA) $$f $(DESTDIR)/usr/$$f ; \
 	done
diff --git a/cf/cf.krb5client b/cf/cf.krb5client
index ed8bceb..372c198 100644
--- a/cf/cf.krb5client
+++ b/cf/cf.krb5client
@@ -6,20 +6,6 @@ shellcommands:
     debian.installation.!standalone.!roaming::
 	"/usr/share/debian-edu-config/tools/sssd-generate-config -k > /etc/krb5.conf"
 
-    debian.installation.!standalone.!roaming::
-	# Move away Squeeze krb5 pam config to allow us to provide a
-	# replacement to fix #656309.
-	# FIXME See if this is still needed in Wheezy.
-        "/usr/bin/dpkg-divert --package debian-edu-config --rename --divert /usr/share/debian-edu-config/pam-config-krb5-orig --add /usr/share/pam-configs/krb5"
-    debian.installation.!standalone.!roaming.secondpass::
-        # Activate changes to pam-configs in /etc/pam.d/
-	"/usr/sbin/pam-auth-update --package"
-
-links:
-
-    debian.installation.!standalone.!roaming::
-        /usr/share/pam-configs/edu-krb5 ->! /usr/share/debian-edu-config/pam-config-krb5
-
 files:
   debian.secondpass.!standalone::
 	/etc/krb5.conf mode=644 act=fixall
diff --git a/debian/changelog b/debian/changelog
index 90f34f7..3f1618a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,10 +13,10 @@ debian-edu-config (1.727) UNRELEASED; urgency=low
     append_if_missing() function.
   * Add autofs to set of handled sssd services in generated
     configuration.
-  * Correct path to dpkg-divert in cf.krb5client.  New path is
-    /usr/bin/.
   * Correct service name for squid in squid-update-cachedir, now called
     squid3.
+  * Reinsert diverted /usr/share/pam-configs/krb5 and drop our override
+    file now that bug #656309 is fixed.
 
  -- Petter Reinholdtsen <pere at debian.org>  Wed, 10 Sep 2014 21:54:52 +0200
 
diff --git a/debian/debian-edu-config.postinst b/debian/debian-edu-config.postinst
index a8f37d0..a553705 100644
--- a/debian/debian-edu-config.postinst
+++ b/debian/debian-edu-config.postinst
@@ -284,6 +284,13 @@ configure)
 	    chown nbd:nbd $swapfiles
 	fi
     fi
+    # Remove now obsolete diverted config file as bug #656309 is fixed
+    if dpkg --compare-versions "$2" le "1.726" && [ -e /usr/share/pam-configs/edu-krb5 ]; then
+            dpkg-divert --package debian-edu-config --remove /usr/share/pam-configs/krb5
+	    pam-auth-update --package --remove edu-krb5
+	    rm /usr/share/pam-configs/edu-krb5
+	fi
+    fi
 
     # sssd refuses to read the file if it has any other mode
     chmod 600 /etc/sssd/sssd-debian-edu.conf
diff --git a/share/debian-edu-config/pam-config-krb5 b/share/debian-edu-config/pam-config-krb5
deleted file mode 100644
index 85a4b3f..0000000
--- a/share/debian-edu-config/pam-config-krb5
+++ /dev/null
@@ -1,15 +0,0 @@
-Name: Kerberos authentication (Debian Edu version)
-Default: yes
-Priority: 704
-Conflicts: krb5-openafs
-Auth-Type: Primary
-Auth:
-	[success=end default=ignore]	pam_krb5.so minimum_uid=1000 try_first_pass
-Auth-Initial:
-	[success=end default=ignore]	pam_krb5.so minimum_uid=1000
-Account-Type: Additional
-Account:
-	required			pam_krb5.so minimum_uid=1000
-Session-Type: Additional
-Session:
-	optional			pam_krb5.so minimum_uid=1000

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-edu/debian-edu-config.git