[checkmk-commits] Check_MK Git: check_mk: Added support for 389 Directory Server to LDAP connector

Module: check_mk Branch: master Commit: eca5ad30ced95a091aec1922c7246534e05650e8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=eca5ad30ced95a… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Apr 10 09:20:08 2014 +0200 Added support for 389 Directory Server to LDAP connector --- .werks/880 | 8 ++++++++ ChangeLog | 1 + web/plugins/userdb/ldap.py | 10 ++++++++++ web/plugins/wato/check_mk_configuration.py | 5 +++-- 4 files changed, 22 insertions(+), 2 deletions(-) diff --git a/.werks/880 b/.werks/880 new file mode 100644 index 0000000..9021b74 --- /dev/null +++ b/.werks/880 @@ -0,0 +1,8 @@ +Title: Added support for 389 Directory Server to LDAP connector +Level: 1 +Component: wato +Version: 1.2.5i3 +Date: 1397114388 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index c4a879a..594f926 100644 --- a/ChangeLog +++ b/ChangeLog @@ -35,6 +35,7 @@ WATO: * 0784 Improved security of WATO bulk inventory by using transaction ids + * 0880 Added support for 389 Directory Server to LDAP connector * 0781 FIX: host diag page: fixed problem with update of diagnose subwindows... Notifications: diff --git a/web/plugins/userdb/ldap.py b/web/plugins/userdb/ldap.py index 3351bb2..7a27705 100644 --- a/web/plugins/userdb/ldap.py +++ b/web/plugins/userdb/ldap.py @@ -66,6 +66,12 @@ ldap_attr_map = { # group attributes 'member': 'uniquemember', }, + '389directoryserver': { + 'user_id': 'uid', + 'pw_changed': 'krbPasswordExpiration', + # group attributes + 'member': 'uniquemember', + }, } # LDAP attributes are case insensitive, we only use lower case! @@ -80,6 +86,10 @@ ldap_filter_map = { 'users': '(objectclass=person)', 'groups': '(objectclass=groupOfUniqueNames)', }, + '389directoryserver': { + 'users': '(objectclass=person)', + 'groups': '(objectclass=groupOfUniqueNames)', + }, } #. diff --git a/web/plugins/wato/check_mk_configuration.py b/web/plugins/wato/check_mk_configuration.py index 2f6faf7..6e5818e 100644 --- a/web/plugins/wato/check_mk_configuration.py +++ b/web/plugins/wato/check_mk_configuration.py @@ -618,8 +618,9 @@ register_configvar(group, "the selection e.g. the attribute names used in LDAP queries will " "be altered."), choices = [ - ("ad", _("Active Directory")), - ("openldap", _("OpenLDAP")), + ("ad", _("Active Directory")), + ("openldap", _("OpenLDAP")), + ("389directoryserver", _("389 Directory Server")), ], )), ("bind", Tuple(