summaryrefslogtreecommitdiff
path: root/server/providers
diff options
context:
space:
mode:
Diffstat (limited to 'server/providers')
-rw-r--r--server/providers/krb5/krb5_auth.c9
-rw-r--r--server/providers/krb5/krb5_auth.h1
2 files changed, 1 insertions, 9 deletions
diff --git a/server/providers/krb5/krb5_auth.c b/server/providers/krb5/krb5_auth.c
index 05f21be1..58f4edda 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 9a7807e8..e70f5d3a 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;