From 0bbe2065770968c70fd305da4f6eda1a360a3f1b Mon Sep 17 00:00:00 2001 From: Sumit Bose Date: Thu, 28 Oct 2010 14:10:43 +0200 Subject: Add krb5_get_simple_upn() --- src/providers/krb5/krb5_auth.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'src/providers/krb5/krb5_auth.c') diff --git a/src/providers/krb5/krb5_auth.c b/src/providers/krb5/krb5_auth.c index 626df2ff..08a97ef1 100644 --- a/src/providers/krb5/krb5_auth.c +++ b/src/providers/krb5/krb5_auth.c @@ -716,14 +716,11 @@ struct tevent_req *krb5_auth_send(TALLOC_CTX *mem_ctx, case 1: kr->upn = ldb_msg_find_attr_as_string(res->msgs[0], SYSDB_UPN, NULL); if (kr->upn == NULL) { - /* NOTE: this is a hack, works only in some environments */ - kr->upn = talloc_asprintf(kr, "%s@%s", pd->user, realm); - if (kr->upn == NULL) { - DEBUG(1, ("failed to build simple upn.\n")); - ret = ENOMEM; + 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; } - DEBUG(9, ("Using simple UPN [%s].\n", kr->upn)); } kr->homedir = ldb_msg_find_attr_as_string(res->msgs[0], SYSDB_HOMEDIR, -- cgit