diff options
| author | Evgeny Fadeev <evgeny.fadeev@gmail.com> | 2012-07-12 23:09:40 -0400 |
|---|---|---|
| committer | Evgeny Fadeev <evgeny.fadeev@gmail.com> | 2012-07-12 23:09:40 -0400 |
| commit | 22044acdf301dbebcfaef2ed1d0563fced3075b4 (patch) | |
| tree | fb4e62691af6bc6864c0f88f91563e254fa0d431 | |
| parent | d9d3fe7396a61f15251d6885786295998a94440e (diff) | |
| download | askbot-22044acdf301dbebcfaef2ed1d0563fced3075b4.tar.gz askbot-22044acdf301dbebcfaef2ed1d0563fced3075b4.tar.bz2 askbot-22044acdf301dbebcfaef2ed1d0563fced3075b4.zip | |
update documentation regarding LDAP authentication setup
| -rw-r--r-- | askbot/deps/django_authopenid/ldap_auth.py | 7 | ||||
| -rw-r--r-- | askbot/doc/source/optional-modules.rst | 6 |
2 files changed, 11 insertions, 2 deletions
diff --git a/askbot/deps/django_authopenid/ldap_auth.py b/askbot/deps/django_authopenid/ldap_auth.py index 536d11f3..109bfad7 100644 --- a/askbot/deps/django_authopenid/ldap_auth.py +++ b/askbot/deps/django_authopenid/ldap_auth.py @@ -9,6 +9,8 @@ from askbot.deps.django_authopenid.models import UserAssociation LOG = logging.getLogger(__name__) def split_name(full_name, name_format): + """splits full name into first and last, + according to the order given in the name_format parameter""" bits = full_name.strip().split() if len(bits) == 1: bits.push('') @@ -25,7 +27,10 @@ def split_name(full_name, name_format): def ldap_authenticate(username, password): """ - Authenticate using ldap + Authenticate using ldap. + LDAP parameter setup is described in + askbot/doc/source/optional-modules.rst + See section about LDAP. returns a dict with keys: diff --git a/askbot/doc/source/optional-modules.rst b/askbot/doc/source/optional-modules.rst index 09a66d55..5db78f70 100644 --- a/askbot/doc/source/optional-modules.rst +++ b/askbot/doc/source/optional-modules.rst @@ -96,7 +96,11 @@ section "LDAP settings" The parameters are (note that some have pre-set defaults that might work for you):: -* enable/disable LDAP for password login +* in Login Provider Settings select "enable local login" + - this makes login/password form available +* enable/disable LDAP for password login - + must check that, to connect the login/password form to LDAP flow +* create accounts automatically or not (``LDAP_AUTOCREATE_USERS``) * protocol version (``LDAP_PROTOCOL_VERSION``) (version 2 is insecure and deprecated) * ldap url (``LDAP_URL``) * base distinguished name, 'dn' in LDAP parlance (``LDAP_BASEDN``) |