diff options
| author | Jakub Hrozek <jhrozek@redhat.com> | 2015-06-03 10:14:37 +0200 |
|---|---|---|
| committer | Jakub Hrozek <jhrozek@redhat.com> | 2015-06-14 21:48:07 +0200 |
| commit | 7abec79ff6eeaff043c995bbb0a152ca3e0744e7 (patch) | |
| tree | 5cbe807a94db9ea3d6fa3f88588b945a9f4a52e5 /src/providers/ldap/ldap_common.c | |
| parent | 3b9f34f653a610f63e88ee0f174a5c47e0d8fe0d (diff) | |
| download | sssd-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/ldap_common.c')
| -rw-r--r-- | src/providers/ldap/ldap_common.c | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/src/providers/ldap/ldap_common.c b/src/providers/ldap/ldap_common.c index 8133431c..840a0987 100644 --- a/src/providers/ldap/ldap_common.c +++ b/src/providers/ldap/ldap_common.c @@ -399,6 +399,18 @@ done: return realm; } +const char *sdap_gssapi_realm(struct dp_option *opts) +{ + const char *realm; + + realm = dp_opt_get_cstring(opts, SDAP_SASL_REALM); + if (!realm) { + realm = dp_opt_get_cstring(opts, SDAP_KRB5_REALM); + } + + return realm; +} + int sdap_gssapi_init(TALLOC_CTX *mem_ctx, struct dp_option *opts, struct be_ctx *bectx, @@ -419,7 +431,7 @@ int sdap_gssapi_init(TALLOC_CTX *mem_ctx, krb5_servers = dp_opt_get_string(opts, SDAP_KRB5_KDC); krb5_backup_servers = dp_opt_get_string(opts, SDAP_KRB5_BACKUP_KDC); - krb5_opt_realm = dp_opt_get_string(opts, SDAP_KRB5_REALM); + krb5_opt_realm = sdap_gssapi_realm(opts); if (krb5_opt_realm == NULL) { DEBUG(SSSDBG_OP_FAILURE, "Missing krb5_realm option, will use libkrb default\n"); |