IntenseWebs/freeipa
3
0
Fork 0
mirror of https://salsa.debian.org/freeipa-team/freeipa.git synced 2025-02-25 18:55:28 -06:00
Code Issues Packages Projects Releases Wiki Activity

Add conditional (env.use_ldap2 is True) modifications required by new LDAP backend.

Browse Source
This commit is contained in:
Pavel Zuna
2009-04-21 15:17:07 +02:00
committed by Rob Crittenden
parent ff0819b189
commit 9ecbd845d4
2 changed files with 19 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ipalib/backend.py
View File

@@ -98,7 +98,10 @@ class Executioner(Backend):
def create_context(self, ccache=None, client_ip=None):
if self.env.in_server:
self.Backend.ldap.connect(ccache)
if self.api.env.use_ldap2:
self.Backend.ldap2.connect(ccache=ccache)
else:
self.Backend.ldap.connect(ccache)
else:
self.Backend.xmlclient.connect()

21
ipalib/frontend.py
View File

@@ -184,12 +184,21 @@ class Command(plugable.Plugin):
return dict(self.__attributes_2_entry(kw))
def __attributes_2_entry(self, kw):
for name in self.params:
if self.params[name].attribute and name in kw:
if type(kw[name]) is tuple:
yield (name, [str(value) for value in kw[name]])
else:
yield (name, str(kw[name]))
if self.api.env.use_ldap2:
for name in self.params:
if self.params[name].attribute and name in kw:
value = kw[name]
if isinstance(value, tuple):
yield (name, [v for v in value])
else:
yield (name, kw[name])
else:
for name in self.params:
if self.params[name].attribute and name in kw:
if type(kw[name]) is tuple:
yield (name, [str(value) for value in kw[name]])
else:
yield (name, str(kw[name]))
def params_2_args_options(self, **params):
"""