From 9e821019e8db89e0f3c408f1c6eb583f89f26a88 Mon Sep 17 00:00:00 2001
From: Sumit Bose <sbose@redhat.com>
Date: Fri, 25 Sep 2009 17:35:56 +0200
Subject: remove krb5_try_simple_upn option and make it a default fallback

---
 server/providers/krb5/krb5_auth.c | 9 +--------
 server/providers/krb5/krb5_auth.h | 1 -
 2 files changed, 1 insertion(+), 9 deletions(-)

(limited to 'server/providers')

diff --git a/server/providers/krb5/krb5_auth.c b/server/providers/krb5/krb5_auth.c
index 05f21be18..58f4edda4 100644
--- a/server/providers/krb5/krb5_auth.c
+++ b/server/providers/krb5/krb5_auth.c
@@ -644,7 +644,7 @@ static void get_user_upn_done(void *pvt, int err, struct ldb_result *res)
 
     case 1:
         pd->upn = ldb_msg_find_attr_as_string(res->msgs[0], SYSDB_UPN, NULL);
-        if (pd->upn == NULL && krb5_ctx->try_simple_upn) {
+        if (pd->upn == NULL) {
             /* NOTE: this is a hack, works only in some environments */
             if (krb5_ctx->realm != NULL) {
                 pd->upn = talloc_asprintf(be_req, "%s@%s", pd->user,
@@ -865,7 +865,6 @@ int sssm_krb5_auth_init(struct be_ctx *bectx,
 {
     struct krb5_ctx *ctx = NULL;
     char *value = NULL;
-    bool bool_value;
     int int_value;
     int ret;
     struct tevent_signal *sige;
@@ -934,12 +933,6 @@ int sssm_krb5_auth_init(struct be_ctx *bectx,
     }
     ctx->ccname_template = value;
 
-    ret = confdb_get_bool(bectx->cdb, ctx, bectx->conf_path,
-                          CONFDB_KRB5_TRY_SIMPLE_UPN, false,
-                          &bool_value);
-    if (ret != EOK) goto fail;
-    ctx->try_simple_upn = bool_value;
-
     ret = confdb_get_string(bectx->cdb, ctx, bectx->conf_path,
                             CONFDB_KRB5_CHANGEPW_PRINC,
                             "kadmin/changepw",
diff --git a/server/providers/krb5/krb5_auth.h b/server/providers/krb5/krb5_auth.h
index 9a7807e8a..e70f5d3aa 100644
--- a/server/providers/krb5/krb5_auth.h
+++ b/server/providers/krb5/krb5_auth.h
@@ -88,7 +88,6 @@ struct krb5_ctx {
 
     char *kdcip;
     char *realm;
-    bool try_simple_upn;
     char *changepw_principle;
     char *ccache_dir;
     char *ccname_template;
-- 
cgit