summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorSumit Bose <sbose@redhat.com>2010-11-02 09:35:00 +0100
committerStephen Gallagher <sgallagh@redhat.com>2010-11-04 15:04:21 -0400
commite481c0f0f16bcb787debf05584a0550a7052dda4 (patch)
treebcac592ea735af4fa11d86f2416dec00fe36f504 /src
parentdc6fb2323c964456d4b22597b575e42f1fd79246 (diff)
downloadsssd-e481c0f0f16bcb787debf05584a0550a7052dda4.tar.gz
sssd-e481c0f0f16bcb787debf05584a0550a7052dda4.tar.bz2
sssd-e481c0f0f16bcb787debf05584a0550a7052dda4.zip
Use (default)namingContext to set empty search bases
Diffstat (limited to 'src')
-rw-r--r--src/providers/ldap/sdap.c103
-rw-r--r--src/providers/ldap/sdap.h5
-rw-r--r--src/providers/ldap/sdap_async.c2
-rw-r--r--src/providers/ldap/sdap_async_connection.c8
4 files changed, 117 insertions, 1 deletions
diff --git a/src/providers/ldap/sdap.c b/src/providers/ldap/sdap.c
index 4d911c45..cf4e9edc 100644
--- a/src/providers/ldap/sdap.c
+++ b/src/providers/ldap/sdap.c
@@ -404,6 +404,109 @@ int sdap_set_rootdse_supported_lists(struct sysdb_attrs *rootdse,
}
+static char *get_single_value_as_string(TALLOC_CTX *mem_ctx,
+ struct ldb_message_element *el)
+{
+ char *str = NULL;
+
+ if (el->num_values == 0) {
+ DEBUG(3, ("Missing value.\n"));
+ } else if (el->num_values == 1) {
+ str = talloc_strndup(mem_ctx, (char *) el->values[0].data,
+ el->values[0].length);
+ if (str == NULL) {
+ DEBUG(1, ("talloc_strndup failed.\n"));
+ }
+ } else {
+ DEBUG(3, ("More than one value found.\n"));
+ }
+
+ return str;
+}
+
+static char *get_naming_context(TALLOC_CTX *mem_ctx,
+ struct sysdb_attrs *rootdse)
+{
+ struct ldb_message_element *nc = NULL;
+ struct ldb_message_element *dnc = NULL;
+ int i;
+ char *naming_context = NULL;
+
+ for (i = 0; i < rootdse->num; i++) {
+ if (strcasecmp(rootdse->a[i].name,
+ SDAP_ROOTDSE_ATTR_NAMING_CONTEXTS) == 0) {
+ nc = &rootdse->a[i];
+ } else if (strcasecmp(rootdse->a[i].name,
+ SDAP_ROOTDSE_ATTR_DEFAULT_NAMING_CONTEXT) == 0) {
+ dnc = &rootdse->a[i];
+ }
+ }
+
+ if (dnc == NULL && nc == NULL) {
+ DEBUG(3, ("No attributes [%s] or [%s] found in rootDSE.\n",
+ SDAP_ROOTDSE_ATTR_NAMING_CONTEXTS,
+ SDAP_ROOTDSE_ATTR_DEFAULT_NAMING_CONTEXT));
+ } else {
+ if (dnc != NULL) {
+ DEBUG(5, ("Using value from [%s] as naming context.\n",
+ SDAP_ROOTDSE_ATTR_DEFAULT_NAMING_CONTEXT));
+ naming_context = get_single_value_as_string(mem_ctx, dnc);
+ }
+
+ if (naming_context == NULL && nc != NULL) {
+ DEBUG(5, ("Using value from [%s] as naming context.\n",
+ SDAP_ROOTDSE_ATTR_NAMING_CONTEXTS));
+ naming_context = get_single_value_as_string(mem_ctx, nc);
+ }
+ }
+
+ return naming_context;
+}
+
+errno_t sdap_set_config_options_with_rootdse(struct sysdb_attrs *rootdse,
+ struct sdap_handle *sh,
+ struct sdap_options *opts)
+{
+ int ret;
+ char *naming_context = NULL;
+ const int search_base_options[] = { SDAP_SEARCH_BASE,
+ SDAP_USER_SEARCH_BASE,
+ SDAP_GROUP_SEARCH_BASE,
+ SDAP_NETGROUP_SEARCH_BASE,
+ -1 };
+ int o;
+
+
+ for (o = 0; search_base_options[o] != -1; o++) {
+ if (dp_opt_get_string(opts->basic, search_base_options[o]) == NULL) {
+ if (naming_context == NULL) {
+ naming_context = get_naming_context(opts->basic, rootdse);
+ if (naming_context == NULL) {
+ DEBUG(1, ("get_naming_context failed.\n"));
+ ret = EINVAL;
+ goto done;
+ }
+ }
+
+ DEBUG(3, ("Setting option [%s] to [%s].\n",
+ opts->basic[search_base_options[o]].opt_name,
+ naming_context));
+ ret = dp_opt_set_string(opts->basic, search_base_options[o],
+ naming_context);
+ if (ret != EOK) {
+ DEBUG(1, ("dp_opt_set_string failed.\n"));
+ goto done;
+ }
+ }
+ }
+
+ ret = EOK;
+
+done:
+ talloc_free(naming_context);
+ return ret;
+}
+
int build_attrs_from_map(TALLOC_CTX *memctx,
struct sdap_attr_map *map,
size_t size, const char ***_attrs)
diff --git a/src/providers/ldap/sdap.h b/src/providers/ldap/sdap.h
index f4ea1099..945de374 100644
--- a/src/providers/ldap/sdap.h
+++ b/src/providers/ldap/sdap.h
@@ -127,6 +127,7 @@ struct sdap_ppolicy_data {
#define SYSDB_PWD_ATTRIBUTE "pwdAttribute"
+#define SDAP_ROOTDSE_ATTR_NAMING_CONTEXTS "namingContexts"
#define SDAP_ROOTDSE_ATTR_DEFAULT_NAMING_CONTEXT "defaultNamingContext"
enum sdap_result {
@@ -319,4 +320,8 @@ int build_attrs_from_map(TALLOC_CTX *memctx,
int sdap_control_create(struct sdap_handle *sh, const char *oid, int iscritical,
struct berval *value, int dupval, LDAPControl **ctrlp);
+
+errno_t sdap_set_config_options_with_rootdse(struct sysdb_attrs *rootdse,
+ struct sdap_handle *sh,
+ struct sdap_options *opts);
#endif /* _SDAP_H_ */
diff --git a/src/providers/ldap/sdap_async.c b/src/providers/ldap/sdap_async.c
index a3e114a0..01cd9670 100644
--- a/src/providers/ldap/sdap_async.c
+++ b/src/providers/ldap/sdap_async.c
@@ -648,7 +648,7 @@ struct tevent_req *sdap_get_rootdse_send(TALLOC_CTX *memctx,
const char *attrs[] = {
"*",
"altServer",
- "namingContexts",
+ SDAP_ROOTDSE_ATTR_NAMING_CONTEXTS,
"supportedControl",
"supportedExtension",
"supportedFeatures",
diff --git a/src/providers/ldap/sdap_async_connection.c b/src/providers/ldap/sdap_async_connection.c
index fbbec182..0cb9162e 100644
--- a/src/providers/ldap/sdap_async_connection.c
+++ b/src/providers/ldap/sdap_async_connection.c
@@ -1277,6 +1277,14 @@ static void sdap_cli_rootdse_done(struct tevent_req *subreq)
return;
}
+ ret = sdap_set_config_options_with_rootdse(rootdse, state->sh,
+ state->opts);
+ if (ret) {
+ DEBUG(1, ("sdap_set_config_options_with_rootdse failed.\n"));
+ tevent_req_error(req, ret);
+ return;
+ }
+
sasl_mech = dp_opt_get_string(state->opts->basic, SDAP_SASL_MECH);
if (sasl_mech && state->use_rootdse) {