diff options
| author | Arthur de Jong <arthur@arthurdejong.org> | 2012-07-15 19:24:35 +0000 |
|---|---|---|
| committer | Arthur de Jong <arthur@arthurdejong.org> | 2012-07-15 19:24:35 +0000 |
| commit | ac0bbbda08331ca0a39fb3723243765d7da15a36 (patch) | |
| tree | b6756f4bf31a66c2462cc8a6d62511bbda4ed0f4 | |
| parent | f61567526817b73882e813ccb593b2669c5882e2 (diff) | |
avoid setting tls_randfile twice and remove fixed FIXME (fixed in r1717)
git-svn-id: http://arthurdejong.org/svn/nss-pam-ldapd/nss-pam-ldapd@1721 ef36b2f9-881f-0410-afb5-c4e39611909c
| -rwxr-xr-x | pynslcd/pynslcd.py | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/pynslcd/pynslcd.py b/pynslcd/pynslcd.py index 087911d..5add334 100755 --- a/pynslcd/pynslcd.py +++ b/pynslcd/pynslcd.py @@ -283,7 +283,6 @@ if __name__ == '__main__': # 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 @@ if __name__ == '__main__': 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: |