nss-pam-ldapd commit: r2041 - debian/nss-pam-ldapd/branches/experimental/debian

[Commits of the nss-pam-ldapd project <nss-pam-ldapd-commits [at] lists.arthurdejong.org>]

Author: arthur
Date: Fri Oct 18 14:30:53 2013
New Revision: 2041
URL: http://arthurdejong.org/viewvc/nss-pam-ldapd?revision=2041&view=revision

Log:
have the nslcd preinst check if a screensaver is running that could end up 
locking users out of their system (heavily based on the eglibc and pam 
packaging)

Added:
   debian/nss-pam-ldapd/branches/experimental/debian/nslcd.preinst
   debian/nss-pam-ldapd/branches/experimental/debian/pynslcd.lintian-overrides
Modified:
   debian/nss-pam-ldapd/branches/experimental/debian/changelog
   debian/nss-pam-ldapd/branches/experimental/debian/control
   debian/nss-pam-ldapd/branches/experimental/debian/nslcd.templates

Modified: debian/nss-pam-ldapd/branches/experimental/debian/changelog
==============================================================================
--- debian/nss-pam-ldapd/branches/experimental/debian/changelog Thu Oct 17 
23:58:09 2013        (r2040)
+++ debian/nss-pam-ldapd/branches/experimental/debian/changelog Fri Oct 18 
14:30:53 2013        (r2041)
@@ -6,8 +6,11 @@
     before starting nslcd (closes: #726435)
   * clean generated manual pages to allow the package to be built tice in
     a row
+  * when upgrading from a pre-0.9 version, have the nslcd preinst check if
+    a screensaver is running that could end up locking users out of their
+    system (heavily based on the eglibc and pam packaging)
 
- -- Arthur de Jong <adejong@debian.org>  Thu, 17 Oct 2013 21:30:00 +0200
+ -- Arthur de Jong <adejong@debian.org>  Fri, 18 Oct 2013 14:00:00 +0200
 
 nss-pam-ldapd (0.9.1-1) experimental; urgency=low
 

Modified: debian/nss-pam-ldapd/branches/experimental/debian/control
==============================================================================
--- debian/nss-pam-ldapd/branches/experimental/debian/control   Thu Oct 17 
23:58:09 2013        (r2040)
+++ debian/nss-pam-ldapd/branches/experimental/debian/control   Fri Oct 18 
14:30:53 2013        (r2041)
@@ -15,6 +15,7 @@
 Architecture: any
 Multi-Arch: foreign
 Provides: nslcd-2
+Pre-Depends: ${misc:Pre-Depends}, debconf (>= 0.5) | debconf-2.0
 Depends: ${misc:Depends}, ${shlibs:Depends}, adduser
 Recommends: nscd,
             libnss-ldapd | libnss-ldap,

Added: debian/nss-pam-ldapd/branches/experimental/debian/nslcd.preinst
==============================================================================
--- /dev/null   00:00:00 1970   (empty, because file is newly added)
+++ debian/nss-pam-ldapd/branches/experimental/debian/nslcd.preinst     Fri Oct 
18 14:30:53 2013        (r2041)
@@ -0,0 +1,26 @@
+#!/bin/sh
+
+set -e
+
+# when upgrading from an pre-0.9 version of the package check for running
+# screensavers that could lock users out when nslcd is replaced
+# (the NSS and PAM modules loaded will not be able to communicate with the
+# new nslcd)
+if [ "$1" = upgrade ] && dpkg --compare-versions "$2" lt "0.9"
+then
+  # perhaps only do check if ldap is enabled in NSS and/or PAM stack
+  if pidof xscreensaver xlockmore > /dev/null
+  then
+    # source debconf library
+    . /usr/share/debconf/confmodule
+    # show note
+    db_version 2.0
+    db_reset nslcd/disable-screensaver
+    db_input critical nslcd/disable-screensaver || true
+    db_go || true
+  fi
+fi
+
+#DEBHELPER#
+
+exit 0

Modified: debian/nss-pam-ldapd/branches/experimental/debian/nslcd.templates
==============================================================================
--- debian/nss-pam-ldapd/branches/experimental/debian/nslcd.templates   Thu Oct 
17 23:58:09 2013        (r2040)
+++ debian/nss-pam-ldapd/branches/experimental/debian/nslcd.templates   Fri Oct 
18 14:30:53 2013        (r2041)
@@ -124,3 +124,13 @@
  .
  If certificate checking is enabled, at least one of the tls_cacertdir or
  tls_cacertfile options must be put in /etc/nslcd.conf.
+
+Template: nslcd/disable-screensaver
+Type: error
+_Description: xscreensaver and xlockmore must be restarted before upgrading
+ One or more running instances of xscreensaver or xlockmore have been
+ detected on this system. Because of incompatible library changes, the
+ upgrade of nslcd may leave you unable to authenticate to these programs.
+ You should arrange for these programs to be restarted or stopped before
+ continuing this upgrade, to avoid locking your users out of their current
+ sessions.

Added: 
debian/nss-pam-ldapd/branches/experimental/debian/pynslcd.lintian-overrides
==============================================================================
--- /dev/null   00:00:00 1970   (empty, because file is newly added)
+++ debian/nss-pam-ldapd/branches/experimental/debian/pynslcd.lintian-overrides 
Fri Oct 18 14:30:53 2013        (r2041)
@@ -0,0 +1,3 @@
+# since pynslcd shares the debconf templates with nslcd it also inherits
+# the disable-screensaver template which isn't used in pynslcd
+pynslcd: unused-debconf-template nslcd/disable-screensaver
-- 
To unsubscribe send an email to
nss-pam-ldapd-commits-unsubscribe@lists.arthurdejong.org or see
http://lists.arthurdejong.org/nss-pam-ldapd-commits/