diff options
| author | Rob Crittenden <rcritten@redhat.com> | 2008-12-05 15:31:18 -0500 |
|---|---|---|
| committer | Rob Crittenden <rcritten@redhat.com> | 2008-12-10 14:15:19 -0500 |
| commit | fc8ac693726ec33b5c0924f9b8ff5d663705a5a3 (patch) | |
| tree | bd8484d2ebd978a9689ab5f6178a3cd92e124692 /ipa_server/plugins/b_ldap.py | |
| parent | a3ab787d23331cf4d060d8463ca66ff602f3629b (diff) | |
| download | freeipa.git-fc8ac693726ec33b5c0924f9b8ff5d663705a5a3.tar.gz freeipa.git-fc8ac693726ec33b5c0924f9b8ff5d663705a5a3.tar.xz freeipa.git-fc8ac693726ec33b5c0924f9b8ff5d663705a5a3.zip | |
Port plugins to use the new output_for_cli() argument list
Fix some errors uncovered by the nosetests
Diffstat (limited to 'ipa_server/plugins/b_ldap.py')
| -rw-r--r-- | ipa_server/plugins/b_ldap.py | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/ipa_server/plugins/b_ldap.py b/ipa_server/plugins/b_ldap.py index 862de1d8..8042474f 100644 --- a/ipa_server/plugins/b_ldap.py +++ b/ipa_server/plugins/b_ldap.py @@ -267,12 +267,15 @@ class ldap(CrudBackend): objectclass = kw.get('objectclass') sfilter = kw.get('filter') attributes = kw.get('attributes') + base = kw.get('base') if attributes: del kw['attributes'] else: attributes = ['*'] if objectclass: del kw['objectclass'] + if base: + del kw['base'] if sfilter: del kw['filter'] (exact_match_filter, partial_match_filter) = self._generate_search_filters(**kw) @@ -283,7 +286,10 @@ class ldap(CrudBackend): exact_match_filter = "(%s%s)" % (sfilter, exact_match_filter) partial_match_filter = "(%s%s)" % (sfilter, partial_match_filter) - search_base = "%s, %s" % (self.api.env.container_accounts, self.api.env.basedn) + if not base: + base = self.api.env.container_accounts + + search_base = "%s, %s" % (base, self.api.env.basedn) try: exact_results = servercore.search(search_base, exact_match_filter, attributes) |