[Pkg-dspam-commits] [SCM] Debian packages for the DSPAM anti-spam filter branch, master, updated. debian/3.9.1_rc1+git20110514.347379b+dfsg-1-1-g37fa75d

[Julien Valroff]

The following commit has been merged in the master branch:
commit 37fa75d1a11e8843617f83b8ff8699750a4a578f
Author: Julien Valroff <julien at kirya.net>
Date:   Sun May 29 16:30:47 2011 +0200

    Ensures system user is actually locked on purge, and unlocked in case the package is reinstalled

diff --git a/debian/changelog b/debian/changelog
index 9ef2b68..993fdf3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+dspam (3.9.1~rc1+git20110514.347379b+dfsg-2) unstable; urgency=low
+
+  * Ensures system user is actually locked on purge, and unlocked in case
+    the package is reinstalled
+
+ -- Julien Valroff <julien at debian.org>  Sun, 29 May 2011 14:07:56 +0200
+
 dspam (3.9.1~rc1+git20110514.347379b+dfsg-1) unstable; urgency=low
 
   * New git snapshot
diff --git a/debian/libdspam7.postinst b/debian/libdspam7.postinst
index 07573ae..215f99d 100644
--- a/debian/libdspam7.postinst
+++ b/debian/libdspam7.postinst
@@ -8,6 +8,9 @@ case "$1" in
             adduser --quiet --system --ingroup dspam --home /var/spool/dspam \
                 --no-create-home --disabled-password \
                 --gecos 'DSPAM' dspam
+        else
+            # Unlock account in case it was locked from previous purge.
+            usermod -U -e '' dspam > /dev/null || true
         fi
     ;;
 
diff --git a/debian/libdspam7.postrm b/debian/libdspam7.postrm
index b06462a..3841a02 100644
--- a/debian/libdspam7.postrm
+++ b/debian/libdspam7.postrm
@@ -3,7 +3,7 @@ set -e
 
 if [ "$1" = "purge" ] ; then
     # locks dspam system account on purge
-    usermod -L dspam > /dev/null || true
+    usermod -L -e 1 dspam > /dev/null || true
 fi
 
 #DEBHELPER#

-- 
Debian packages for the DSPAM anti-spam filter