# HG changeset patch # User Paul Tonelli # Date 1414069022 -7200 # Node ID 340d4ef55b6f8ba27333548d854678b8747f2aae # Parent 3dd66bdbfe8e216876bdfac149de1bf358aadea0 [ldapfeed] Reduce default value for user-attrs-map option (closes #3824889) This is needed because lgc.configuration.Configuration does not allow removing key/value pairs from the default (due to its use of dict.update() internally). Since CWUser.login is required, users of the add-source command will always be able to override it. diff -r 3dd66bdbfe8e -r 340d4ef55b6f server/sources/ldapfeed.py --- a/server/sources/ldapfeed.py Tue Apr 29 11:34:42 2014 +0200 +++ b/server/sources/ldapfeed.py Thu Oct 23 14:57:02 2014 +0200 @@ -126,7 +126,7 @@ }), ('user-attrs-map', {'type' : 'named', - 'default': {'uid': 'login', 'gecos': 'email', 'userPassword': 'upassword'}, + 'default': {'uid': 'login'}, 'help': 'map from ldap user attributes to cubicweb attributes (with Active Directory, you want to use sAMAccountName:login,mail:email,givenName:firstname,sn:surname)', 'group': 'ldap-source', 'level': 1, }),