From 964628ab89229e9266adc5f4f8a26222734788b7 Mon Sep 17 00:00:00 2001 From: Sumit Bose Date: Wed, 24 Oct 2012 09:47:21 +0200 Subject: Use find_or_guess_upn() where needed --- src/providers/krb5/krb5_access.c | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) (limited to 'src/providers/krb5/krb5_access.c') diff --git a/src/providers/krb5/krb5_access.c b/src/providers/krb5/krb5_access.c index afa3a89df..25612807d 100644 --- a/src/providers/krb5/krb5_access.c +++ b/src/providers/krb5/krb5_access.c @@ -25,6 +25,7 @@ #include "util/util.h" #include "providers/krb5/krb5_auth.h" #include "providers/krb5/krb5_common.h" +#include "providers/krb5/krb5_utils.h" struct krb5_access_state { struct tevent_context *ev; @@ -101,15 +102,12 @@ struct tevent_req *krb5_access_send(TALLOC_CTX *mem_ctx, goto done; break; case 1: - state->kr->upn = ldb_msg_find_attr_as_string(res->msgs[0], SYSDB_UPN, - NULL); - if (state->kr->upn == NULL) { - ret = krb5_get_simple_upn(state, krb5_ctx, pd->user, - &state->kr->upn); - if (ret != EOK) { - DEBUG(1, ("krb5_get_simple_upn failed.\n")); - goto done; - } + ret = find_or_guess_upn(state, res->msgs[0], krb5_ctx, + be_ctx->domain->name, pd->user, pd->domain, + &state->kr->upn); + if (ret != EOK) { + DEBUG(SSSDBG_OP_FAILURE, ("find_or_guess_upn failed.\n")); + goto done; } state->kr->uid = ldb_msg_find_attr_as_uint64(res->msgs[0], SYSDB_UIDNUM, -- cgit