# HG changeset patch # User Pierre-Yves David # Date 1366726022 -7200 # Node ID ed35d984ff28cf59e701332ff49e4ddbc2d0ecce # Parent c8fc3e3b46e4d5e9e7c21f34ee853d8698786a21 [ldap] an empty 'user-base-dn' disable the user importation process, The same semantic will be used for group. We start by using it for user for the sake of consistency. diff -r c8fc3e3b46e4 -r ed35d984ff28 server/ldaputils.py --- a/server/ldaputils.py Tue Apr 23 15:46:09 2013 +0200 +++ b/server/ldaputils.py Tue Apr 23 16:07:02 2013 +0200 @@ -88,8 +88,8 @@ ('user-base-dn', {'type' : 'string', - 'default': 'ou=People,dc=logilab,dc=fr', - 'help': 'base DN to lookup for users', + 'default': '', + 'help': 'base DN to lookup for users; disable user importation mechanism if unset', 'group': 'ldap-source', 'level': 1, }), ('user-scope', diff -r c8fc3e3b46e4 -r ed35d984ff28 sobjects/ldapparser.py --- a/sobjects/ldapparser.py Tue Apr 23 15:46:09 2013 +0200 +++ b/sobjects/ldapparser.py Tue Apr 23 16:07:02 2013 +0200 @@ -42,11 +42,13 @@ @cachedproperty def source_entities_by_extid(self): source = self.source - return dict((userdict['dn'], userdict) - for userdict in source._search(self._cw, - source.user_base_dn, - source.user_base_scope, - self.searchfilterstr)) + if source.user_base_dn.strip(): + return dict((userdict['dn'], userdict) + for userdict in source._search(self._cw, + source.user_base_dn, + source.user_base_scope, + self.searchfilterstr)) + return {} def process(self, url, raise_on_error=False): """IDataFeedParser main entry point"""