diff options
| -rw-r--r-- | ipalib/constants.py | 1 | ||||
| -rw-r--r-- | ipalib/frontend.py | 22 |
2 files changed, 7 insertions, 16 deletions
diff --git a/ipalib/constants.py b/ipalib/constants.py index 57062fdf9..60d2510b6 100644 --- a/ipalib/constants.py +++ b/ipalib/constants.py @@ -109,7 +109,6 @@ DEFAULT_CONFIG = ( ('verbose', False), ('debug', False), ('mode', 'production'), - ('use_ldap2', False), # CA plugin: ('ca_host', object), # Set in Env._finalize_core() diff --git a/ipalib/frontend.py b/ipalib/frontend.py index aca350a49..2a5c5311e 100644 --- a/ipalib/frontend.py +++ b/ipalib/frontend.py @@ -473,21 +473,13 @@ class Command(HasParam): return dict(self.__attributes_2_entry(kw)) def __attributes_2_entry(self, kw): - 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])) + 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]) def params_2_args_options(self, **params): """ |