lists.arthurdejong.org
RSS feed

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

[Date Prev][Date Next] [Thread Prev][Thread Next]

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



Author: arthur
Date: Mon Oct  1 21:28:17 2012
New Revision: 1777
URL: http://arthurdejong.org/viewvc/nss-pam-ldapd?revision=1777&view=revision

Log:
fix a problem in sed logic for commenting out disabled options (closes: #689296)

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 Fri Sep 21 10:36:29 2012        
(r1776)
+++ debian/nss-pam-ldapd/trunk/debian/changelog Mon Oct  1 21:28:17 2012        
(r1777)
@@ -1,3 +1,10 @@
+nss-pam-ldapd (0.8.10-3) UNRELEASED; urgency=low
+
+  * fix a problem in sed logic for commenting out disabled options
+    (closes: #689296)
+
+ -- Arthur de Jong <adejong@debian.org>  Mon, 01 Oct 2012 21:00:00 +0200
+
 nss-pam-ldapd (0.8.10-2) unstable; urgency=low
 
   * fix typo in comment (thanks Caleb Callaway)

Modified: debian/nss-pam-ldapd/trunk/debian/nslcd.postinst
==============================================================================
--- debian/nss-pam-ldapd/trunk/debian/nslcd.postinst    Fri Sep 21 10:36:29 
2012        (r1776)
+++ debian/nss-pam-ldapd/trunk/debian/nslcd.postinst    Mon Oct  1 21:28:17 
2012        (r1777)
@@ -49,7 +49,7 @@
     # lines to not match
     
nomatch_re="^$param_re[[:space:]][[:space:]]*\(aliases\|ethers\|group\|hosts\|netgroup\|networks\|passwd\|protocols\|rpc\|services\|shadow\)"
     # comment out the option
-    sed -i '/'"$nomatch_re"'/n;s/^'"$param_re"'[[:space:]].*$/#&/i' "$CONFFILE"
+    sed -i '/'"$nomatch_re"'/!s/^'"$param_re"'[[:space:]].*$/#&/i' "$CONFFILE"
     # we're done
   done
   return 0
-- 
To unsubscribe send an email to
nss-pam-ldapd-commits-unsubscribe@lists.arthurdejong.org or see
http://lists.arthurdejong.org/nss-pam-ldapd-commits/