changeset 4677:9eeae87fdd36

merged moin/1.7
author Thomas Waldmann <tw AT waldmann-edv DOT de>
date Mon, 06 Apr 2009 12:28:51 +0200
parents 0946442e94ab (current diff) e42fc41f71a4 (diff)
children e17387246649 58b18877d6ac
files MoinMoin/auth/ldap_login.py
diffstat 1 files changed, 4 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/MoinMoin/auth/ldap_login.py	Wed Apr 01 10:37:58 2009 +0200
+++ b/MoinMoin/auth/ldap_login.py	Mon Apr 06 12:28:51 2009 +0200
@@ -76,10 +76,10 @@
         coding='utf-8', # coding used for ldap queries and result values
         timeout=10, # how long we wait for the ldap server [s]
         start_tls=0, # 0 = No, 1 = Try, 2 = Required
-        tls_cacertdir='',
-        tls_cacertfile='',
-        tls_certfile='',
-        tls_keyfile='',
+        tls_cacertdir=None,
+        tls_cacertfile=None,
+        tls_certfile=None,
+        tls_keyfile=None,
         tls_require_cert=0, # 0 == ldap.OPT_X_TLS_NEVER (needed for self-signed certs)
         bind_once=False, # set to True to only do one bind - useful if configured to bind as the user on the first attempt
         autocreate=False, # set to True if you want to autocreate user profiles