nss-pam-ldapd commit: r1305 - 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:06:07 2010
New Revision: 1305
URL: http://arthurdejong.org/viewvc/nss-pam-ldapd?view=rev&revision=1305

Log:
handle tls_reqcert option consistently with other options

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

Modified: nss-pam-ldapd/debian/nslcd.config
==============================================================================
--- nss-pam-ldapd/debian/nslcd.config   Sun Nov  7 17:38:48 2010        (r1304)
+++ nss-pam-ldapd/debian/nslcd.config   Sun Nov  7 18:06:07 2010        (r1305)
@@ -235,6 +235,8 @@
     then
       # ask whether to do certificate validation
       db_input high nslcd/ldap-reqcert || true
+    else
+      db_set nslcd/ldap-reqcert ""
     fi
     # ask the question, go to the next question or back
     state="done"

Modified: nss-pam-ldapd/debian/nslcd.postinst
==============================================================================
--- nss-pam-ldapd/debian/nslcd.postinst Sun Nov  7 17:38:48 2010        (r1304)
+++ nss-pam-ldapd/debian/nslcd.postinst Sun Nov  7 18:06:07 2010        (r1305)
@@ -210,16 +210,16 @@
   then
     cfg_disable ssl
   fi
+  # rename any tls_checkpeer options
+  sed -i 's/^tls_checkpeer/tls_reqcert/i' "$CONFFILE"
   # set tls_reqcert option
   db_get nslcd/ldap-reqcert
   if [ -n "$RET" ]
   then
-    # rename any tls_checkpeer options
-    sed -i 's/^tls_checkpeer/tls_reqcert/i' "$CONFFILE"
     # set tls_reqcert option
     cfg_set tls_reqcert "$RET"
-    # clear debconf value so that this option is only set if the question is 
asked
-    db_set nslcd/ldap-reqcert ""
+  else
+    cfg_disable tls_reqcert
   fi
   # we're done
   db_stop
--
To unsubscribe send an email to
nss-pam-ldapd-commits-unsubscribe@lists.arthurdejong.org or see
http://lists.arthurdejong.org/nss-pam-ldapd-commits