From fd7f7085335f2731ded5ee5cd4923561b693893d Mon Sep 17 00:00:00 2001
From: Sumit Bose <sbose@redhat.com>
Date: Tue, 2 Nov 2010 09:35:00 +0100
Subject: [PATCH 1/2] Use namingContext to set empty search bases

---
 src/providers/ldap/sdap.c                  |   75 ++++++++++++++++++++++++++++
 src/providers/ldap/sdap.h                  |    4 ++
 src/providers/ldap/sdap_async_connection.c |    8 +++
 3 files changed, 87 insertions(+), 0 deletions(-)

diff --git a/src/providers/ldap/sdap.c b/src/providers/ldap/sdap.c
index 4d911c4..9df7d9a 100644
--- a/src/providers/ldap/sdap.c
+++ b/src/providers/ldap/sdap.c
@@ -404,6 +404,81 @@ int sdap_set_rootdse_supported_lists(struct sysdb_attrs *rootdse,
 
 }
 
+static char *get_naming_context(TALLOC_CTX *mem_ctx,
+                                struct sysdb_attrs *rootdse)
+{
+    struct ldb_message_element *el = NULL;
+    int i;
+    char *naming_context = NULL;
+
+    for (i = 0; i < rootdse->num; i++) {
+        el = &rootdse->a[i];
+        if (strcasecmp(el->name, "namingContexts") == 0) {
+            if (el->num_values == 0) {
+                DEBUG(3, ("Missing namingContexts value in rootDSE.\n"));
+            } else if (el->num_values == 1) {
+                naming_context = talloc_strndup(mem_ctx,
+                                                (char *) el->values[0].data,
+                                                el->values[0].length);
+                if (naming_context == NULL) {
+                    DEBUG(1, ("talloc_strndup failed.\n"));
+                }
+            } else {
+                DEBUG(3, ("More than one namingContexts found.\n"));
+            }
+
+            return naming_context;
+        }
+    }
+
+    DEBUG(3, ("No attribute 'namingContexts' found in rootDSE.\n"))
+    return NULL;
+}
+
+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 be4cf8a..cae6510 100644
--- a/src/providers/ldap/sdap.h
+++ b/src/providers/ldap/sdap.h
@@ -317,4 +317,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_connection.c b/src/providers/ldap/sdap_async_connection.c
index fbbec18..0cb9162 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) {
-- 
1.7.2.3