diff options
| author | Rob Crittenden <rcritten@redhat.com> | 2008-10-24 11:40:47 -0400 |
|---|---|---|
| committer | Rob Crittenden <rcritten@redhat.com> | 2008-10-24 11:41:39 -0400 |
| commit | 8788afe18403e7585e4fc2b6a52a352a035fee0b (patch) | |
| tree | 55fd07c27eff7c54f8e5faf5f9b002c5c4709a4a | |
| parent | 6a8026f974c4ab65313729eb9e61303b5395a0c0 (diff) | |
| download | freeipa.git-8788afe18403e7585e4fc2b6a52a352a035fee0b.tar.gz freeipa.git-8788afe18403e7585e4fc2b6a52a352a035fee0b.tar.xz freeipa.git-8788afe18403e7585e4fc2b6a52a352a035fee0b.zip | |
Use posixAccount instead of person to identify users
Add output_for_cli to service-find
| -rw-r--r-- | ipa_server/plugins/b_ldap.py | 2 | ||||
| -rw-r--r-- | ipa_server/servercore.py | 2 | ||||
| -rw-r--r-- | ipalib/plugins/f_passwd.py | 2 | ||||
| -rw-r--r-- | ipalib/plugins/f_service.py | 10 |
4 files changed, 11 insertions, 5 deletions
diff --git a/ipa_server/plugins/b_ldap.py b/ipa_server/plugins/b_ldap.py index a7a3c8b3..2c65ba45 100644 --- a/ipa_server/plugins/b_ldap.py +++ b/ipa_server/plugins/b_ldap.py @@ -88,7 +88,7 @@ class ldap(CrudBackend): attribute = attribute.lower() object_type = None if attribute == "uid": # User - object_type = "person" + object_type = "posixAccount" elif attribute == "cn": # Group object_type = "posixGroup" elif attribute == "krbprincipalname": # Service diff --git a/ipa_server/servercore.py b/ipa_server/servercore.py index e69967a9..052c386b 100644 --- a/ipa_server/servercore.py +++ b/ipa_server/servercore.py @@ -168,7 +168,7 @@ def get_user_by_uid(uid, sattrs): """Get a specific user's entry.""" # FIXME: should accept a container to look in # uid = self.__safe_filter(uid) - searchfilter = "(&(uid=%s)(objectclass=person))" % uid + searchfilter = "(&(uid=%s)(objectclass=posixAccount))" % uid return get_sub_entry("cn=accounts," + api.env.basedn, searchfilter, sattrs) diff --git a/ipalib/plugins/f_passwd.py b/ipalib/plugins/f_passwd.py index f70eacac..7b424a3b 100644 --- a/ipalib/plugins/f_passwd.py +++ b/ipalib/plugins/f_passwd.py @@ -60,7 +60,7 @@ class passwd(frontend.Command): else: principal = principal - dn = ldap.find_entry_dn("krbprincipalname", principal, "person") + dn = ldap.find_entry_dn("krbprincipalname", principal, "posixAccount") # FIXME: we need a way to prompt for passwords using getpass kw['newpass'] = "password" diff --git a/ipalib/plugins/f_service.py b/ipalib/plugins/f_service.py index 38c80ad2..9e9cec53 100644 --- a/ipalib/plugins/f_service.py +++ b/ipalib/plugins/f_service.py @@ -110,7 +110,7 @@ class service_add(crud.Add): def output_to_cli(self, ret): if ret: - print "Service added" + print "Service added" api.register(service_add) @@ -146,7 +146,7 @@ class service_find(crud.Find): def execute(self, principal, **kw): ldap = self.api.Backend.ldap - kw['filter'] = "&(objectclass=krbPrincipalAux)(!(objectClass=person))(!(|(krbprincipalname=kadmin/*)(krbprincipalname=K/M@*)(krbprincipalname=krbtgt/*)))" + kw['filter'] = "&(objectclass=krbPrincipalAux)(!(objectClass=posixAccount))(!(|(krbprincipalname=kadmin/*)(krbprincipalname=K/M@*)(krbprincipalname=krbtgt/*)))" kw['krbprincipalname'] = principal object_type = ldap.get_object_type("krbprincipalname") @@ -193,5 +193,11 @@ class service_show(crud.Get): dn = ldap.find_entry_dn("krbprincipalname", principal) # FIXME: should kw contain the list of attributes to display? return ldap.retrieve(dn) + def output_for_cli(self, service): + if not service: + return + + for a in service.keys(): + print "%s: %s" % (a, service[a]) api.register(service_show) |