diff options
| author | Sumit Bose <sbose@redhat.com> | 2012-10-24 09:47:21 +0200 |
|---|---|---|
| committer | Jakub Hrozek <jhrozek@redhat.com> | 2012-11-05 00:14:05 +0100 |
| commit | 983fab6286fa68b8586d7f20850491dc5ec22188 (patch) | |
| tree | c24fe8f66b4bda86f07b9cbcf7294484bba48df3 /src/providers/krb5/krb5_auth.c | |
| parent | b598728537c67557f20d760e2e4127ec868a434b (diff) | |
| download | sssd-983fab6286fa68b8586d7f20850491dc5ec22188.tar.gz sssd-983fab6286fa68b8586d7f20850491dc5ec22188.tar.xz sssd-983fab6286fa68b8586d7f20850491dc5ec22188.zip | |
Use find_or_guess_upn() where needed
Diffstat (limited to 'src/providers/krb5/krb5_auth.c')
| -rw-r--r-- | src/providers/krb5/krb5_auth.c | 27 |
1 files changed, 13 insertions, 14 deletions
diff --git a/src/providers/krb5/krb5_auth.c b/src/providers/krb5/krb5_auth.c index 98dc8d840..c1f9f14b1 100644 --- a/src/providers/krb5/krb5_auth.c +++ b/src/providers/krb5/krb5_auth.c @@ -420,20 +420,19 @@ struct tevent_req *krb5_auth_send(TALLOC_CTX *mem_ctx, break; case 1: - kr->upn = ldb_msg_find_attr_as_string(res->msgs[0], SYSDB_UPN, NULL); - if (kr->upn == NULL) { - ret = krb5_get_simple_upn(state, krb5_ctx, pd->user, &kr->upn); - if (ret != EOK) { - DEBUG(1, ("krb5_get_simple_upn failed.\n")); - goto done; - } - } else { - ret = compare_principal_realm(kr->upn, realm, - &kr->upn_from_different_realm); - if (ret != 0) { - DEBUG(SSSDBG_OP_FAILURE, ("compare_principal_realm failed.\n")); - goto done; - } + ret = find_or_guess_upn(state, res->msgs[0], krb5_ctx, + be_ctx->domain->name, pd->user, pd->domain, + &kr->upn); + if (ret != EOK) { + DEBUG(SSSDBG_OP_FAILURE, ("find_or_guess_upn failed.\n")); + goto done; + } + + ret = compare_principal_realm(kr->upn, realm, + &kr->upn_from_different_realm); + if (ret != 0) { + DEBUG(SSSDBG_OP_FAILURE, ("compare_principal_realm failed.\n")); + goto done; } kr->homedir = ldb_msg_find_attr_as_string(res->msgs[0], SYSDB_HOMEDIR, |