diff options
| author | Rob Crittenden <rcritten@redhat.com> | 2010-11-03 15:31:46 -0400 |
|---|---|---|
| committer | Adam Young <ayoung@redhat.com> | 2010-11-04 12:49:33 -0400 |
| commit | 6f5cd3232a26868e5753a6a615b5b645e9251f2d (patch) | |
| tree | 42e8db722b602aa69ceff169ebd7a848d4181397 /ipalib/plugins/baseldap.py | |
| parent | 72cf73b6b6bc12f7412fa18a35d50e74ac80ba5f (diff) | |
| download | freeipa-6f5cd3232a26868e5753a6a615b5b645e9251f2d.tar.gz freeipa-6f5cd3232a26868e5753a6a615b5b645e9251f2d.tar.xz freeipa-6f5cd3232a26868e5753a6a615b5b645e9251f2d.zip | |
user-enable/disable improvements
Always display the account enable/disable status.
Don't ignore the exceptions when a user is already enabled or disabled.
Fix the exception error messages to use the right terminology.
In baseldap when retrieving all attributes include the default attributes
in case they include some operational attributes.
ticket 392
Diffstat (limited to 'ipalib/plugins/baseldap.py')
| -rw-r--r-- | ipalib/plugins/baseldap.py | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/ipalib/plugins/baseldap.py b/ipalib/plugins/baseldap.py index 97a02946b..708d1e4a1 100644 --- a/ipalib/plugins/baseldap.py +++ b/ipalib/plugins/baseldap.py @@ -400,7 +400,7 @@ class LDAPCreate(CallbackInterface, crud.Create): ) if options.get('all', False): - attrs_list = ['*'] + attrs_list = ['*'] + self.obj.default_attributes else: attrs_list = list( set(self.obj.default_attributes + entry_attrs.keys()) @@ -538,7 +538,7 @@ class LDAPRetrieve(LDAPQuery): dn = self.obj.get_dn(*keys, **options) if options.get('all', False): - attrs_list = ['*'] + attrs_list = ['*'] + self.obj.default_attributes else: attrs_list = list(self.obj.default_attributes) @@ -643,7 +643,7 @@ class LDAPUpdate(LDAPQuery, crud.Update): entry_attrs[a] += old_entry[a] if options.get('all', False): - attrs_list = ['*'] + attrs_list = ['*'] + self.obj.default_attributes else: attrs_list = list( set(self.obj.default_attributes + entry_attrs.keys()) @@ -903,7 +903,7 @@ class LDAPAddMember(LDAPModMember): completed += 1 if options.get('all', False): - attrs_list = ['*'] + attrs_list = ['*'] + self.obj.default_attributes else: attrs_list = list( set(self.obj.default_attributes + member_dns.keys()) @@ -1005,7 +1005,7 @@ class LDAPRemoveMember(LDAPModMember): completed += 1 if options.get('all', False): - attrs_list = ['*'] + attrs_list = ['*'] + self.obj.default_attributes else: attrs_list = list( set(self.obj.default_attributes + member_dns.keys()) @@ -1100,7 +1100,7 @@ class LDAPSearch(CallbackInterface, crud.Search): search_kw = self.args_options_2_entry(**options) if options.get('all', False): - attrs_list = ['*'] + attrs_list = ['*'] + self.obj.default_attributes else: attrs_list = list( set(self.obj.default_attributes + search_kw.keys()) |