diff options
| -rw-r--r-- | ipapython/certdb.py | 2 | ||||
| -rw-r--r-- | ipaserver/plugins/ldapapi.py | 9 |
2 files changed, 8 insertions, 3 deletions
diff --git a/ipapython/certdb.py b/ipapython/certdb.py index f88fcd465..891b6c061 100644 --- a/ipapython/certdb.py +++ b/ipapython/certdb.py @@ -120,7 +120,7 @@ class CertDB(object): else: trust_flag="u,u,u" - # Generate a CSR + # Import a certificate from an ASCII file args = ["-A", "-n", nickname, "-t", trust_flag, diff --git a/ipaserver/plugins/ldapapi.py b/ipaserver/plugins/ldapapi.py index 995abe381..cb55f1cfa 100644 --- a/ipaserver/plugins/ldapapi.py +++ b/ipaserver/plugins/ldapapi.py @@ -46,10 +46,10 @@ class ldap(CrudBackend): if ccache is None: raise errors.CCacheError() conn = ipaldap.IPAdmin(self.env.ldap_host, self.env.ldap_port) - principle = krbV.CCache( + principal = krbV.CCache( name=ccache, context=krbV.default_context() ).principal().name - conn.set_krbccache(ccache, principle) + conn.set_krbccache(ccache, principal) return conn def destroy_connection(self): @@ -443,4 +443,9 @@ class ldap(CrudBackend): return results + def get_effective_rights(self, dn, attrs=None): + binddn = self.find_entry_dn("krbprincipalname", self.conn.principal, "posixAccount") + + return servercore.get_effective_rights(binddn, dn, attrs) + api.register(ldap) |