diff options
author | Simo Sorce <ssorce@redhat.com> | 2012-02-13 22:21:17 -0500 |
---|---|---|
committer | Rob Crittenden <rcritten@redhat.com> | 2012-02-15 04:51:08 -0500 |
commit | ebba5d94f482b359b87ee200d0dc669ed83136c5 (patch) | |
tree | 10824fff3fd9da5d81623a7ae9e0f151a0d57f45 | |
parent | e0d533e4eccd16dc608fbfe434da43aa6b50e6de (diff) | |
download | freeipa-ebba5d94f482b359b87ee200d0dc669ed83136c5.tar.gz freeipa-ebba5d94f482b359b87ee200d0dc669ed83136c5.tar.xz freeipa-ebba5d94f482b359b87ee200d0dc669ed83136c5.zip |
ipa-kdb: Avoid lookup on modify if possible
This avoids one useless search if we already have the entry_dn.
-rw-r--r-- | daemons/ipa-kdb/ipa_kdb_principals.c | 46 |
1 files changed, 27 insertions, 19 deletions
diff --git a/daemons/ipa-kdb/ipa_kdb_principals.c b/daemons/ipa-kdb/ipa_kdb_principals.c index 3540f0eea..9a3c86fb0 100644 --- a/daemons/ipa-kdb/ipa_kdb_principals.c +++ b/daemons/ipa-kdb/ipa_kdb_principals.c @@ -1760,33 +1760,37 @@ static krb5_error_code ipadb_modify_principal(krb5_context kcontext, LDAPMessage *lentry; struct ipadb_mods *imods = NULL; char *dn = NULL; + struct ipadb_e_data *ied; ipactx = ipadb_get_context(kcontext); if (!ipactx) { return KRB5_KDB_DBNOTINITED; } - kerr = krb5_unparse_name(kcontext, entry->princ, &principal); - if (kerr != 0) { - goto done; - } + ied = (struct ipadb_e_data *)entry->e_data; + if (!ied || !ied->entry_dn) { + kerr = krb5_unparse_name(kcontext, entry->princ, &principal); + if (kerr != 0) { + goto done; + } - kerr = ipadb_fetch_principals(ipactx, principal, &res); - if (kerr != 0) { - goto done; - } + kerr = ipadb_fetch_principals(ipactx, principal, &res); + if (kerr != 0) { + goto done; + } - /* FIXME: no alias allowed for now, should we allow modifies - * by alias name ? */ - kerr = ipadb_find_principal(kcontext, 0, res, &principal, &lentry); - if (kerr != 0) { - goto done; - } + /* FIXME: no alias allowed for now, should we allow modifies + * by alias name ? */ + kerr = ipadb_find_principal(kcontext, 0, res, &principal, &lentry); + if (kerr != 0) { + goto done; + } - dn = ldap_get_dn(ipactx->lcontext, lentry); - if (!dn) { - kerr = KRB5_KDB_INTERNAL_ERROR; - goto done; + dn = ldap_get_dn(ipactx->lcontext, lentry); + if (!dn) { + kerr = KRB5_KDB_INTERNAL_ERROR; + goto done; + } } kerr = new_ipadb_mods(&imods); @@ -1800,7 +1804,11 @@ static krb5_error_code ipadb_modify_principal(krb5_context kcontext, goto done; } - kerr = ipadb_simple_modify(ipactx, dn, imods->mods); + if (!ied || !ied->entry_dn) { + kerr = ipadb_simple_modify(ipactx, dn, imods->mods); + } else { + kerr = ipadb_simple_modify(ipactx, ied->entry_dn, imods->mods); + } done: ipadb_mods_free(imods); |