diff options
| author | Martin Babinsky <mbabinsk@redhat.com> | 2016-06-29 14:54:54 +0200 |
|---|---|---|
| committer | Martin Basti <mbasti@redhat.com> | 2016-07-01 09:37:25 +0200 |
| commit | acf2234ebc8609a35a8f45598d5d817cbdbff121 (patch) | |
| tree | 5549b77b1c0868fb8ef63df06070635318fcc444 /ipaserver/plugins | |
| parent | e6ff83e3610d553f6ff98e3adbfbe3c6984b2f17 (diff) | |
| download | freeipa-acf2234ebc8609a35a8f45598d5d817cbdbff121.tar.gz freeipa-acf2234ebc8609a35a8f45598d5d817cbdbff121.tar.xz freeipa-acf2234ebc8609a35a8f45598d5d817cbdbff121.zip | |
Unify display of principal names/aliases across entities
Since now users, hosts, and service all support assigning multiple principal
aliases to them, the display of kerberos principal names should be consistent
across all these objects. Principal aliases and canonical names will now be
displayed in all add, mod, show, and find operations.
https://fedorahosted.org/freeipa/ticket/3864
Reviewed-By: David Kupka <dkupka@redhat.com>
Reviewed-By: Jan Cholasta <jcholast@redhat.com>
Diffstat (limited to 'ipaserver/plugins')
| -rw-r--r-- | ipaserver/plugins/baseuser.py | 4 | ||||
| -rw-r--r-- | ipaserver/plugins/host.py | 7 | ||||
| -rw-r--r-- | ipaserver/plugins/service.py | 6 |
3 files changed, 11 insertions, 6 deletions
diff --git a/ipaserver/plugins/baseuser.py b/ipaserver/plugins/baseuser.py index c80d5ac0d..0052e718a 100644 --- a/ipaserver/plugins/baseuser.py +++ b/ipaserver/plugins/baseuser.py @@ -149,9 +149,11 @@ class baseuser(LDAPObject): 'memberofindirect', 'ipauserauthtype', 'userclass', 'ipatokenradiusconfiglink', 'ipatokenradiususername', 'krbprincipalexpiration', 'usercertificate;binary', + 'krbprincipalname', 'krbcanonicalname' ] search_display_attributes = [ - 'uid', 'givenname', 'sn', 'homedirectory', 'loginshell', + 'uid', 'givenname', 'sn', 'homedirectory', 'krbcanonicalname', + 'krbprincipalname', 'loginshell', 'mail', 'telephonenumber', 'title', 'nsaccountlock', 'uidnumber', 'gidnumber', 'sshpubkeyfp', ] diff --git a/ipaserver/plugins/host.py b/ipaserver/plugins/host.py index 1c1e934b9..2c5cf48cb 100644 --- a/ipaserver/plugins/host.py +++ b/ipaserver/plugins/host.py @@ -263,11 +263,12 @@ class host(LDAPObject): permission_filter_objectclasses = ['ipahost'] # object_class_config = 'ipahostobjectclasses' search_attributes = [ - 'fqdn', 'description', 'l', 'nshostlocation', 'krbprincipalname', - 'nshardwareplatform', 'nsosversion', 'managedby', + 'fqdn', 'description', 'l', 'nshostlocation', 'krbcanonicalname', + 'krbprincipalname', 'nshardwareplatform', 'nsosversion', 'managedby', ] default_attributes = [ - 'fqdn', 'description', 'l', 'nshostlocation', 'krbprincipalname', + 'fqdn', 'description', 'l', 'nshostlocation', 'krbcanonicalname', + 'krbprincipalname', 'nshardwareplatform', 'nsosversion', 'usercertificate', 'memberof', 'managedby', 'memberofindirect', 'macaddress', 'userclass', 'ipaallowedtoperform', 'ipaassignedidview', 'krbprincipalauthind' diff --git a/ipaserver/plugins/service.py b/ipaserver/plugins/service.py index 417be0011..28ea364e9 100644 --- a/ipaserver/plugins/service.py +++ b/ipaserver/plugins/service.py @@ -361,8 +361,10 @@ class service(LDAPObject): possible_objectclasses = ['ipakrbprincipal', 'ipaallowedoperations'] permission_filter_objectclasses = ['ipaservice'] search_attributes = ['krbprincipalname', 'managedby', 'ipakrbauthzdata'] - default_attributes = ['krbprincipalname', 'usercertificate', 'managedby', - 'ipakrbauthzdata', 'memberof', 'ipaallowedtoperform', 'krbprincipalauthind'] + default_attributes = [ + 'krbprincipalname', 'krbcanonicalname', 'usercertificate', 'managedby', + 'ipakrbauthzdata', 'memberof', 'ipaallowedtoperform', + 'krbprincipalauthind'] uuid_attribute = 'ipauniqueid' attribute_members = { 'managedby': ['host'], |