nss-pam-ldapd commit: r1306 - nss-pam-ldapd/debian

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

Author: arthur
Date: Sun Nov  7 18:08:53 2010
New Revision: 1306
URL: http://arthurdejong.org/viewvc/nss-pam-ldapd?view=rev&revision=1306

Log:
move special casing of handling bindpw removal to cfg_disable() function

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

Modified: nss-pam-ldapd/debian/nslcd.postinst
==============================================================================
--- nss-pam-ldapd/debian/nslcd.postinst Sun Nov  7 18:06:07 2010        (r1305)
+++ nss-pam-ldapd/debian/nslcd.postinst Sun Nov  7 18:08:53 2010        (r1306)
@@ -45,6 +45,11 @@
 cfg_disable()
 {
   parameter="$1"
+  # handle bindpw option specially by removing value from config first
+  if [ "$parameter" = "bindpw" ] && grep -i -q "^bindpw " $CONFFILE
+  then
+    cfg_set bindpw "*removed*"
+  fi
   # make matching of spaces better in parameter
   param_re=`echo "$parameter" | sed 
's#^#[[:space:]]*#;s#[[:space:]][[:space:]]*#[[:space:]][[:space:]]*#g'`
   # lines to not match
@@ -183,21 +188,12 @@
     then
       cfg_set bindpw "$RET"
     else
-      # no bindpw set
-      if grep -i -q "^bindpw " $CONFFILE
-      then
-        cfg_set bindpw "*removed*"
-        cfg_disable bindpw
-      fi
+      cfg_disable bindpw
     fi
   else
     # no binddn/pw, disable options
     cfg_disable binddn
-    if grep -i -q "^bindpw " $CONFFILE
-    then
-      cfg_set bindpw "*removed*"
-      cfg_disable bindpw
-    fi
+    cfg_disable bindpw
   fi
   # remove password from database
   db_set nslcd/ldap-bindpw ""
--
To unsubscribe send an email to
nss-pam-ldapd-commits-unsubscribe@lists.arthurdejong.org or see
http://lists.arthurdejong.org/nss-pam-ldapd-commits