enable the PAM module by default using pam-auth-update, based on a patch for libpam-ldap by Steve Langasek <vorlon@debian.org>

git-svn-id: http://arthurdejong.org/svn/nss-pam-ldapd/nss-pam-ldapd@899 ef36b2f9-881f-0410-afb5-c4e39611909c

7 files changed, 45 insertions, 1 deletions

diff --git a/Makefile.am b/Makefile.am
index 3f9a046..0987460 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -48,6 +48,9 @@ DEBIAN_FILES = debian/changelog debian/compat debian/control \
                debian/libnss-ldapd.postrm \
                debian/libnss-ldapd.templates \
                debian/libpam-ldapd.install \
+               debian/libpam-ldapd.pam-auth-update \
+               debian/libpam-ldapd.postint \
+               debian/libpam-ldapd.prerm \
                debian/po/POTFILES.in debian/po/templates.pot \
                $(wildcard debian/po/*.po)
 
diff --git a/debian/control b/debian/control
index 076e5c7..94c3714 100644
--- a/debian/control
+++ b/debian/control
@@ -34,7 +34,7 @@ Description: NSS module for using LDAP as a naming service
 
 Package: libpam-ldapd
 Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}, nslcd
+Depends: ${misc:Depends}, ${shlibs:Depends}, nslcd, libpam-runtime (>= 1.0.1-6)
 Recommends: libnss-ldapd | libnss-ldap
 Conflicts: libpam-ldap
 Provides: libpam-ldap
diff --git a/debian/libpam-ldapd.install b/debian/libpam-ldapd.install
index d1f6515..dc09072 100644
--- a/debian/libpam-ldapd.install
+++ b/debian/libpam-ldapd.install
@@ -1 +1,2 @@
 lib/security
+usr/share/pam-configs/ldap
diff --git a/debian/libpam-ldapd.pam-auth-update b/debian/libpam-ldapd.pam-auth-update
new file mode 100644
index 0000000..6fdfeb7
--- /dev/null
+++ b/debian/libpam-ldapd.pam-auth-update
@@ -0,0 +1,19 @@
+Name: LDAP Authentication
+Default: yes
+Priority: 128
+Auth-Type: Primary
+Auth-Initial:
+	[success=end default=ignore]	pam_ldap.so
+Auth:
+	[success=end default=ignore]	pam_ldap.so use_first_pass
+Account-Type: Primary
+Account:
+	[success=end default=ignore]	pam_ldap.so
+Password-Type: Primary
+Password-Initial:
+	[success=end user_unknown=ignore default=die]	pam_ldap.so
+Password:
+	[success=end user_unknown=ignore default=die]	pam_ldap.so use_authtok try_first_pass
+Session-Type: Additional
+Session:
+	optional			pam_ldap.so
diff --git a/debian/libpam-ldapd.postint b/debian/libpam-ldapd.postint
new file mode 100644
index 0000000..20c9b76
--- /dev/null
+++ b/debian/libpam-ldapd.postint
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+set -e
+
+#DEBHELPER#
+
+pam-auth-update --package
diff --git a/debian/libpam-ldapd.prerm b/debian/libpam-ldapd.prerm
new file mode 100644
index 0000000..4d4e093
--- /dev/null
+++ b/debian/libpam-ldapd.prerm
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+set -e
+
+if [ "$1" = remove ]
+then
+  pam-auth-update --package --remove ldap
+fi
+
+#DEBHELPER#
+
+exit 0
diff --git a/debian/rules b/debian/rules
index 41cace5..d4f575d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -56,6 +56,8 @@ install: build
 	# install a lintian override file
 	install -D -m 644 $(CURDIR)/debian/libnss-ldapd.lintian-overrides \
 	        $(CURDIR)/debian/libnss-ldapd/usr/share/lintian/overrides/libnss-ldapd
+	# install a pam-auth-update configuration file
+	install -D -m 644 debian/libpam-ldapd.pam-auth-update debian/tmp/usr/share/pam-configs/ldap
 
 # build architecture-independent files
 binary-indep: build install