nss-pam-ldapd commit: r1721 - nss-pam-ldapd/pynslcd

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

Author: arthur
Date: Sun Jul 15 21:24:35 2012
New Revision: 1721
URL: http://arthurdejong.org/viewvc/nss-pam-ldapd?revision=1721&view=revision

Log:
avoid setting tls_randfile twice and remove fixed FIXME (fixed in r1717)

Modified:
   nss-pam-ldapd/pynslcd/pynslcd.py

Modified: nss-pam-ldapd/pynslcd/pynslcd.py
==============================================================================
--- nss-pam-ldapd/pynslcd/pynslcd.py    Sun Jul 15 21:20:35 2012        (r1720)
+++ nss-pam-ldapd/pynslcd/pynslcd.py    Sun Jul 15 21:24:35 2012        (r1721)
@@ -283,7 +283,6 @@
     #    sys.exit(1)
     # read configuration file
     cfg.read(config.NSLCD_CONF_PATH)
-    # FIXME: set tls_cacertdir, tls_cacertfile, tls_randfile, tls_ciphers, 
tls_cert, tls_key options immediately after parsing config
     # set process title
     try:
         import setproctitle
@@ -352,8 +351,6 @@
                 ldap.set_option(ldap.OPT_X_TLS_CACERTFILE, cfg.tls_cacertfile)
             if cfg.tls_randfile:
                 ldap.set_option(ldap.OPT_X_TLS_RANDOM_FILE, cfg.tls_randfile)
-            if cfg.tls_randfile:
-                ldap.set_option(ldap.OPT_X_TLS_RANDOM_FILE, cfg.tls_randfile)
             if cfg.tls_ciphers:
                 ldap.set_option(ldap.OPT_X_TLS_CIPHER_SUITE, cfg.tls_ciphers)
             if cfg.tls_cert:
-- 
To unsubscribe send an email to
nss-pam-ldapd-commits-unsubscribe@lists.arthurdejong.org or see
http://lists.arthurdejong.org/nss-pam-ldapd-commits/