nss-pam-ldapd commit: r1618 - debian/nss-pam-ldapd/trunk/debian

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

Author: arthur
Date: Sun Jan 29 17:23:19 2012
New Revision: 1618
URL: http://arthurdejong.org/viewvc/nss-pam-ldapd?revision=1618&view=revision

Log:
automatically comment out mapping of uniqueMember to member on upgrades because 
member is default now

Modified:
   debian/nss-pam-ldapd/trunk/debian/changelog
   debian/nss-pam-ldapd/trunk/debian/nslcd.postinst

Modified: debian/nss-pam-ldapd/trunk/debian/changelog
==============================================================================
--- debian/nss-pam-ldapd/trunk/debian/changelog Sun Jan 29 16:37:44 2012        
(r1617)
+++ debian/nss-pam-ldapd/trunk/debian/changelog Sun Jan 29 17:23:19 2012        
(r1618)
@@ -6,8 +6,10 @@
   * updated Norwegian Bokmål debconf translation by Bjørn Steensrud
     (closes: #654273)
   * updated Simplified Chinese debconf translation by zym (closes: #654679)
+  * automatically comment out mapping of uniqueMember to member on upgrades
+    because member is default now
 
- -- Arthur de Jong <adejong@debian.org>  Sat, 21 Jan 2012 16:46:29 +0100
+ -- Arthur de Jong <adejong@debian.org>  Sun, 29 Jan 2012 17:15:00 +0100
 
 nss-pam-ldapd (0.8.5) unstable; urgency=low
 

Modified: debian/nss-pam-ldapd/trunk/debian/nslcd.postinst
==============================================================================
--- debian/nss-pam-ldapd/trunk/debian/nslcd.postinst    Sun Jan 29 16:37:44 
2012        (r1617)
+++ debian/nss-pam-ldapd/trunk/debian/nslcd.postinst    Sun Jan 29 17:23:19 
2012        (r1618)
@@ -196,6 +196,14 @@
     echo "Renaming reconnect_maxsleeptime to reconnect_retrytime in 
$CONFFILE..." >&2
     sed -i 's/^reconnect_maxsleeptime[[:space:]]/reconnect_retrytime /' 
"$CONFFILE"
   fi
+  # comment out mapping of uniqueMember to member which is now used by default
+  if grep -qi 
'^map[[:space:]]*group[[:space:]]*uniqueMember[[:space:]]*member[[:space:]]*$' 
$CONFFILE
+  then
+    echo "Commenting out uniqueMember mapping due to rename in $CONFFILE..." 
>&2
+    sed -i 
'/^map[[:space:]]*group[[:space:]]*uniqueMember[[:space:]]*member[[:space:]]*$/i
 \
+#off# automatically commented out next line because this is now the default
+s/^map[[:space:]]*group[[:space:]]*uniqueMember[[:space:]]*member[[:space:]]*$/#off#
 &/' "$CONFFILE"
+  fi
   # set server uri
   db_get nslcd/ldap-uris
   cfg_uris "$RET"
-- 
To unsubscribe send an email to
nss-pam-ldapd-commits-unsubscribe@lists.arthurdejong.org or see
http://lists.arthurdejong.org/nss-pam-ldapd-commits/