summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJakub Hrozek <jhrozek@redhat.com>2011-08-23 23:19:57 +0200
committerStephen Gallagher <sgallagh@redhat.com>2011-08-26 16:52:52 -0400
commita2e6bd6ed16c92799d435043450f6156a773a6dc (patch)
treea0234fa507a72afc720848788c625d6437a63671
parent47db32cd9cb2147bb40909352569d7c8274365db (diff)
downloadsssd-a2e6bd6ed16c92799d435043450f6156a773a6dc.tar.gz
sssd-a2e6bd6ed16c92799d435043450f6156a773a6dc.tar.xz
sssd-a2e6bd6ed16c92799d435043450f6156a773a6dc.zip
Add LDAP provider option to set LDAP_OPT_X_SASL_NOCANON
https://fedorahosted.org/sssd/ticket/978
-rw-r--r--src/config/SSSDConfig.py1
-rw-r--r--src/config/etc/sssd.api.d/sssd-ldap.conf1
-rw-r--r--src/man/sssd-ldap.5.xml14
-rw-r--r--src/providers/ipa/ipa_common.c3
-rw-r--r--src/providers/ipa/ipa_common.h2
-rw-r--r--src/providers/ldap/ldap_common.c3
-rw-r--r--src/providers/ldap/sdap.h1
-rw-r--r--src/providers/ldap/sdap_async_connection.c11
8 files changed, 33 insertions, 3 deletions
diff --git a/src/config/SSSDConfig.py b/src/config/SSSDConfig.py
index 53bd14f0d..77a57c66e 100644
--- a/src/config/SSSDConfig.py
+++ b/src/config/SSSDConfig.py
@@ -149,6 +149,7 @@ option_strings = {
'ldap_dns_service_name' : _('Service name for DNS service lookups'),
'ldap_page_size' : _('The number of records to retrieve in a single LDAP query'),
'ldap_deref_threshold' : _('The number of members that must be missing to trigger a full deref'),
+ 'ldap_sasl_canonicalize' : _('Whether the LDAP library should perform a reverse lookup to canonicalize the host name during a SASL bind'),
'ldap_entry_usn' : _('entryUSN attribute'),
'ldap_rootdse_last_usn' : _('lastUSN attribute'),
diff --git a/src/config/etc/sssd.api.d/sssd-ldap.conf b/src/config/etc/sssd.api.d/sssd-ldap.conf
index 18321cade..78a7fa34b 100644
--- a/src/config/etc/sssd.api.d/sssd-ldap.conf
+++ b/src/config/etc/sssd.api.d/sssd-ldap.conf
@@ -29,6 +29,7 @@ ldap_dns_service_name = str, None, false
ldap_deref = str, None, false
ldap_page_size = int, None, false
ldap_deref_threshold = int, None, false
+ldap_sasl_canonicalize = bool, None, false
[provider/ldap/id]
ldap_search_timeout = int, None, false
diff --git a/src/man/sssd-ldap.5.xml b/src/man/sssd-ldap.5.xml
index 7c364abea..be1d333a5 100644
--- a/src/man/sssd-ldap.5.xml
+++ b/src/man/sssd-ldap.5.xml
@@ -1104,6 +1104,20 @@
</varlistentry>
<varlistentry>
+ <term>ldap_sasl_canonicalize (boolean)</term>
+ <listitem>
+ <para>
+ If set to true, the LDAP library would perform
+ a reverse lookup to canonicalize the host name
+ during a SASL bind.
+ </para>
+ <para>
+ Default: false;
+ </para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
<term>ldap_krb5_keytab (string)</term>
<listitem>
<para>
diff --git a/src/providers/ipa/ipa_common.c b/src/providers/ipa/ipa_common.c
index 7e548009a..c62294568 100644
--- a/src/providers/ipa/ipa_common.c
+++ b/src/providers/ipa/ipa_common.c
@@ -97,7 +97,8 @@ struct dp_option ipa_def_ldap_opts[] = {
*/
{ "ldap_auth_disable_tls_never_use_in_production", DP_OPT_BOOL, BOOL_FALSE, BOOL_FALSE },
{ "ldap_page_size", DP_OPT_NUMBER, { .number = 1000 }, NULL_NUMBER },
- { "ldap_deref_threshold", DP_OPT_NUMBER, { .number = 10 }, NULL_NUMBER }
+ { "ldap_deref_threshold", DP_OPT_NUMBER, { .number = 10 }, NULL_NUMBER },
+ { "ldap_sasl_canonicalize", DP_OPT_BOOL, BOOL_FALSE, BOOL_FALSE }
};
struct sdap_attr_map ipa_attr_map[] = {
diff --git a/src/providers/ipa/ipa_common.h b/src/providers/ipa/ipa_common.h
index 76336f3d0..575911504 100644
--- a/src/providers/ipa/ipa_common.h
+++ b/src/providers/ipa/ipa_common.h
@@ -35,7 +35,7 @@ struct ipa_service {
/* the following defines are used to keep track of the options in the ldap
* module, so that if they change and ipa is not updated correspondingly
* this will trigger a runtime abort error */
-#define IPA_OPTS_BASIC_TEST 51
+#define IPA_OPTS_BASIC_TEST 52
/* the following define is used to keep track of the options in the krb5
* module, so that if they change and ipa is not updated correspondingly
diff --git a/src/providers/ldap/ldap_common.c b/src/providers/ldap/ldap_common.c
index f26a428df..13ba9de69 100644
--- a/src/providers/ldap/ldap_common.c
+++ b/src/providers/ldap/ldap_common.c
@@ -88,7 +88,8 @@ struct dp_option default_basic_opts[] = {
*/
{ "ldap_auth_disable_tls_never_use_in_production", DP_OPT_BOOL, BOOL_FALSE, BOOL_FALSE },
{ "ldap_page_size", DP_OPT_NUMBER, { .number = 1000 }, NULL_NUMBER },
- { "ldap_deref_threshold", DP_OPT_NUMBER, { .number = 10 }, NULL_NUMBER }
+ { "ldap_deref_threshold", DP_OPT_NUMBER, { .number = 10 }, NULL_NUMBER },
+ { "ldap_sasl_canonicalize", DP_OPT_BOOL, BOOL_FALSE, BOOL_FALSE }
};
struct sdap_attr_map generic_attr_map[] = {
diff --git a/src/providers/ldap/sdap.h b/src/providers/ldap/sdap.h
index baac956be..2e270f346 100644
--- a/src/providers/ldap/sdap.h
+++ b/src/providers/ldap/sdap.h
@@ -199,6 +199,7 @@ enum sdap_basic_opt {
SDAP_DISABLE_AUTH_TLS,
SDAP_PAGE_SIZE,
SDAP_DEREF_THRESHOLD,
+ SDAP_SASL_CANONICALIZE,
SDAP_OPTS_BASIC /* opts counter */
};
diff --git a/src/providers/ldap/sdap_async_connection.c b/src/providers/ldap/sdap_async_connection.c
index 6f67700db..b391aa96f 100644
--- a/src/providers/ldap/sdap_async_connection.c
+++ b/src/providers/ldap/sdap_async_connection.c
@@ -151,6 +151,7 @@ static void sdap_sys_connect_done(struct tevent_req *subreq)
int ldap_deref_val;
struct sdap_rebind_proc_params *rebind_proc_params;
int sd;
+ bool sasl_nocanon;
ret = sss_ldap_init_recv(subreq, &state->sh->ldap, &sd);
talloc_zfree(subreq);
@@ -260,6 +261,16 @@ static void sdap_sys_connect_done(struct tevent_req *subreq)
}
+ /* Set host name canonicalization for LDAP SASL bind */
+ sasl_nocanon = !dp_opt_get_bool(state->opts->basic, SDAP_SASL_CANONICALIZE);
+ lret = ldap_set_option(state->sh->ldap, LDAP_OPT_X_SASL_NOCANON,
+ sasl_nocanon ? LDAP_OPT_ON : LDAP_OPT_OFF);
+ if (lret != LDAP_OPT_SUCCESS) {
+ DEBUG(1, ("Failed to set LDAP SASL nocanon option to %s\n",
+ sasl_nocanon ? "true" : "false"));
+ goto fail;
+ }
+
/* if we do not use start_tls the connection is not really connected yet
* just fake an async procedure and leave connection to the bind call */
if (!state->use_start_tls) {