summaryrefslogtreecommitdiffstats
path: root/src/providers/ldap/sdap_async_connection.c
diff options
context:
space:
mode:
authorJakub Hrozek <jhrozek@redhat.com>2015-06-03 10:14:37 +0200
committerJakub Hrozek <jhrozek@redhat.com>2015-06-14 21:48:07 +0200
commit7abec79ff6eeaff043c995bbb0a152ca3e0744e7 (patch)
tree5cbe807a94db9ea3d6fa3f88588b945a9f4a52e5 /src/providers/ldap/sdap_async_connection.c
parent3b9f34f653a610f63e88ee0f174a5c47e0d8fe0d (diff)
downloadsssd-7abec79ff6eeaff043c995bbb0a152ca3e0744e7.tar.gz
sssd-7abec79ff6eeaff043c995bbb0a152ca3e0744e7.tar.xz
sssd-7abec79ff6eeaff043c995bbb0a152ca3e0744e7.zip
LDAP: Consolidate SDAP_SASL_REALM/SDAP_KRB5_REALM behaviour
Reviewed-by: Sumit Bose <sbose@redhat.com>
Diffstat (limited to 'src/providers/ldap/sdap_async_connection.c')
-rw-r--r--src/providers/ldap/sdap_async_connection.c8
1 files changed, 1 insertions, 7 deletions
diff --git a/src/providers/ldap/sdap_async_connection.c b/src/providers/ldap/sdap_async_connection.c
index 431845d3f..34db75a4e 100644
--- a/src/providers/ldap/sdap_async_connection.c
+++ b/src/providers/ldap/sdap_async_connection.c
@@ -1708,12 +1708,6 @@ static void sdap_cli_kinit_step(struct tevent_req *req)
struct sdap_cli_connect_state *state = tevent_req_data(req,
struct sdap_cli_connect_state);
struct tevent_req *subreq;
- const char *realm;
-
- realm = dp_opt_get_string(state->opts->basic, SDAP_SASL_REALM);
- if (!realm) {
- realm = dp_opt_get_string(state->opts->basic, SDAP_KRB5_REALM);
- }
subreq = sdap_kinit_send(state, state->ev,
state->be,
@@ -1725,7 +1719,7 @@ static void sdap_cli_kinit_step(struct tevent_req *req)
SDAP_KRB5_KEYTAB),
dp_opt_get_string(state->opts->basic,
SDAP_SASL_AUTHID),
- realm,
+ sdap_gssapi_realm(state->opts->basic),
dp_opt_get_bool(state->opts->basic,
SDAP_KRB5_CANONICALIZE),
dp_opt_get_int(state->opts->basic,