s4-dsdb: isGlobalCatalogReady should be shown by default
[ira/wip.git] / source4 / dsdb / samdb / ldb_modules / rootdse.c
index 97491a2ae3911825b1bbeece0625c5d16948c94c..9d2b8cdc5b848f56f15807435073a541c51cda0b 100644 (file)
@@ -4,7 +4,7 @@
    rootDSE ldb module
 
    Copyright (C) Andrew Tridgell 2005
-   Copyright (C) Simo Sorce 2005
+   Copyright (C) Simo Sorce 2005-2008
    
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -22,8 +22,7 @@
 
 #include "includes.h"
 #include "lib/ldb/include/ldb.h"
-#include "lib/ldb/include/ldb_errors.h"
-#include "lib/ldb/include/ldb_private.h"
+#include "lib/ldb/include/ldb_module.h"
 #include "system/time.h"
 #include "dsdb/samdb/samdb.h"
 #include "version.h"
@@ -51,18 +50,134 @@ static int do_attribute_explicit(const char * const *attrs, const char *name)
 }
 
 
+/*
+  expand a DN attribute to include extended DN information if requested
+ */
+static int expand_dn_in_message(struct ldb_module *module, struct ldb_message *msg,
+                               const char *attrname, struct ldb_control *edn_control,
+                               struct ldb_request *req)
+{
+       struct ldb_dn *dn, *dn2;
+       struct ldb_val *v;
+       int ret;
+       struct ldb_request *req2;
+       char *dn_string;
+       const char *no_attrs[] = { NULL };
+       struct ldb_result *res;
+       struct ldb_extended_dn_control *edn;
+       TALLOC_CTX *tmp_ctx = talloc_new(req);
+       struct ldb_context *ldb;
+       int edn_type = 0;
+
+       ldb = ldb_module_get_ctx(module);
+
+       edn = talloc_get_type(edn_control->data, struct ldb_extended_dn_control);
+       if (edn) {
+               edn_type = edn->type;
+       }
+
+       v = discard_const_p(struct ldb_val, ldb_msg_find_ldb_val(msg, attrname));
+       if (v == NULL) {
+               talloc_free(tmp_ctx);
+               return 0;
+       }
+
+       dn_string = talloc_strndup(tmp_ctx, (const char *)v->data, v->length);
+       if (dn_string == NULL) {
+               talloc_free(tmp_ctx);
+               return LDB_ERR_OPERATIONS_ERROR;
+       }
+
+       res = talloc_zero(tmp_ctx, struct ldb_result);
+       if (res == NULL) {
+               talloc_free(tmp_ctx);
+               return LDB_ERR_OPERATIONS_ERROR;
+       }
+
+       dn = ldb_dn_new(tmp_ctx, ldb, dn_string);
+       if (!ldb_dn_validate(dn)) {
+               talloc_free(tmp_ctx);
+               return LDB_ERR_OPERATIONS_ERROR;
+       }
+
+       ret = ldb_build_search_req(&req2, ldb, tmp_ctx,
+                                  dn,
+                                  LDB_SCOPE_BASE,
+                                  NULL,
+                                  no_attrs,
+                                  NULL,
+                                  res, ldb_search_default_callback,
+                                  req);
+       if (ret != LDB_SUCCESS) {
+               talloc_free(tmp_ctx);
+               return ret;
+       }
+
+
+       ret = ldb_request_add_control(req2,
+                                     LDB_CONTROL_EXTENDED_DN_OID,
+                                     edn_control->critical, edn);
+       if (ret != LDB_SUCCESS) {
+               talloc_free(tmp_ctx);
+               return ret;
+       }
+
+       ret = ldb_next_request(module, req2);
+       if (ret == LDB_SUCCESS) {
+               ret = ldb_wait(req2->handle, LDB_WAIT_ALL);
+       }
+       if (ret != LDB_SUCCESS) {
+               talloc_free(tmp_ctx);
+               return ret;
+       }
+
+       if (!res || res->count != 1) {
+               talloc_free(tmp_ctx);
+               return LDB_ERR_OPERATIONS_ERROR;
+       }
+
+       dn2 = res->msgs[0]->dn;
+
+       v->data = (uint8_t *)ldb_dn_get_extended_linearized(msg->elements, dn2, edn_type);
+       v->length = strlen((char *)v->data);
+
+       if (v->data == NULL) {
+               talloc_free(tmp_ctx);
+               return LDB_ERR_OPERATIONS_ERROR;
+       }
+
+       talloc_free(tmp_ctx);
+
+       return 0;
+}      
+                       
+
 /*
   add dynamically generated attributes to rootDSE result
 */
-static int rootdse_add_dynamic(struct ldb_module *module, struct ldb_message *msg, const char * const *attrs)
+static int rootdse_add_dynamic(struct ldb_module *module, struct ldb_message *msg, 
+                              const char * const *attrs, struct ldb_request *req)
 {
-       struct private_data *priv = talloc_get_type(module->private_data, struct private_data);
+       struct ldb_context *ldb;
+       struct private_data *priv = talloc_get_type(ldb_module_get_private(module), struct private_data);
        char **server_sasl;
        const struct dsdb_schema *schema;
-
-       schema = dsdb_get_schema(module->ldb);
-
-       msg->dn = ldb_dn_new(msg, module->ldb, NULL);
+       int *val;
+       struct ldb_control *edn_control;
+       const char *dn_attrs[] = {
+               "configurationNamingContext",
+               "defaultNamingContext",
+               "dsServiceName",
+               "rootDomainNamingContext",
+               "schemaNamingContext",
+               "serverName",
+               NULL
+       };
+
+       ldb = ldb_module_get_ctx(module);
+       schema = dsdb_get_schema(ldb);
+
+       msg->dn = ldb_dn_new(msg, ldb, NULL);
 
        /* don't return the distinduishedName, cn and name attributes */
        ldb_msg_remove_attr(msg, "distinguishedName");
@@ -76,7 +191,7 @@ static int rootdse_add_dynamic(struct ldb_module *module, struct ldb_message *ms
                }
        }
 
-       if (do_attribute(attrs, "supportedControl")) {
+       if (priv && do_attribute(attrs, "supportedControl")) {
                int i;
                for (i = 0; i < priv->num_controls; i++) {
                        char *control = talloc_strdup(msg, priv->controls[i]);
@@ -90,7 +205,7 @@ static int rootdse_add_dynamic(struct ldb_module *module, struct ldb_message *ms
                }
        }
 
-       if (do_attribute(attrs, "namingContexts")) {
+       if (priv && do_attribute(attrs, "namingContexts")) {
                int i;
                for (i = 0; i < priv->num_partitions; i++) {
                        struct ldb_dn *dn = priv->partitions[i];
@@ -101,7 +216,7 @@ static int rootdse_add_dynamic(struct ldb_module *module, struct ldb_message *ms
                }
        }
 
-       server_sasl = talloc_get_type(ldb_get_opaque(module->ldb, "supportedSASLMechanims"), 
+       server_sasl = talloc_get_type(ldb_get_opaque(ldb, "supportedSASLMechanims"), 
                                       char *);
        if (server_sasl && do_attribute(attrs, "supportedSASLMechanisms")) {
                int i;
@@ -119,7 +234,7 @@ static int rootdse_add_dynamic(struct ldb_module *module, struct ldb_message *ms
 
        if (do_attribute(attrs, "highestCommittedUSN")) {
                uint64_t seq_num;
-               int ret = ldb_sequence_number(module->ldb, LDB_SEQ_HIGHEST_SEQ, &seq_num);
+               int ret = ldb_sequence_number(ldb, LDB_SEQ_HIGHEST_SEQ, &seq_num);
                if (ret == LDB_SUCCESS) {
                        if (ldb_msg_add_fmt(msg, "highestCommittedUSN", 
                                            "%llu", (unsigned long long)seq_num) != 0) {
@@ -158,7 +273,7 @@ static int rootdse_add_dynamic(struct ldb_module *module, struct ldb_message *ms
 
        if (schema && do_attribute_explicit(attrs, "dsSchemaPrefixCount")) {
                if (ldb_msg_add_fmt(msg, "dsSchemaPrefixCount", 
-                                   "%u", schema->num_prefixes) != 0) {
+                                   "%u", schema->prefixmap->length) != 0) {
                        goto failed;
                }
        }
@@ -169,7 +284,7 @@ static int rootdse_add_dynamic(struct ldb_module *module, struct ldb_message *ms
                const char *dn_str;
 
                if (schema && schema->fsmo.we_are_master) {
-                       dn_str = ldb_dn_get_linearized(samdb_schema_dn(module->ldb));
+                       dn_str = ldb_dn_get_linearized(samdb_schema_dn(ldb));
                        if (dn_str && dn_str[0]) {
                                if (ldb_msg_add_fmt(msg, "validFSMOs", "%s", dn_str) != 0) {
                                        goto failed;
@@ -177,10 +292,10 @@ static int rootdse_add_dynamic(struct ldb_module *module, struct ldb_message *ms
                        }
                }
 
-               naming_fsmo = talloc_get_type(ldb_get_opaque(module->ldb, "dsdb_naming_fsmo"),
+               naming_fsmo = talloc_get_type(ldb_get_opaque(ldb, "dsdb_naming_fsmo"),
                                              struct dsdb_naming_fsmo);
                if (naming_fsmo && naming_fsmo->we_are_master) {
-                       dn_str = ldb_dn_get_linearized(samdb_partitions_dn(module->ldb, msg));
+                       dn_str = ldb_dn_get_linearized(samdb_partitions_dn(ldb, msg));
                        if (dn_str && dn_str[0]) {
                                if (ldb_msg_add_fmt(msg, "validFSMOs", "%s", dn_str) != 0) {
                                        goto failed;
@@ -188,10 +303,10 @@ static int rootdse_add_dynamic(struct ldb_module *module, struct ldb_message *ms
                        }
                }
 
-               pdc_fsmo = talloc_get_type(ldb_get_opaque(module->ldb, "dsdb_pdc_fsmo"),
+               pdc_fsmo = talloc_get_type(ldb_get_opaque(ldb, "dsdb_pdc_fsmo"),
                                           struct dsdb_pdc_fsmo);
                if (pdc_fsmo && pdc_fsmo->we_are_master) {
-                       dn_str = ldb_dn_get_linearized(samdb_base_dn(module->ldb));
+                       dn_str = ldb_dn_get_linearized(samdb_base_dn(ldb));
                        if (dn_str && dn_str[0]) {
                                if (ldb_msg_add_fmt(msg, "validFSMOs", "%s", dn_str) != 0) {
                                        goto failed;
@@ -200,13 +315,68 @@ static int rootdse_add_dynamic(struct ldb_module *module, struct ldb_message *ms
                }
        }
 
-       if (schema && do_attribute_explicit(attrs, "vendorVersion")) {
+       if (do_attribute_explicit(attrs, "vendorVersion")) {
                if (ldb_msg_add_fmt(msg, "vendorVersion", 
                                    "%s", SAMBA_VERSION_STRING) != 0) {
                        goto failed;
                }
        }
 
+       if (priv && do_attribute(attrs, "domainFunctionality")) {
+               if (ldb_msg_add_fmt(msg, "domainFunctionality", 
+                                   "%d", dsdb_functional_level(ldb)) != 0) {
+                       goto failed;
+               }
+       }
+
+       if (priv && do_attribute(attrs, "forestFunctionality")
+           && (val = talloc_get_type(ldb_get_opaque(ldb, "forestFunctionality"), int))) {
+               if (ldb_msg_add_fmt(msg, "forestFunctionality", 
+                                   "%d", *val) != 0) {
+                       goto failed;
+               }
+       }
+
+       if (priv && do_attribute(attrs, "domainControllerFunctionality")
+           && (val = talloc_get_type(ldb_get_opaque(ldb, "domainControllerFunctionality"), int))) {
+               if (ldb_msg_add_fmt(msg, "domainControllerFunctionality", 
+                                   "%d", *val) != 0) {
+                       goto failed;
+               }
+       }
+
+       edn_control = ldb_request_get_control(req, LDB_CONTROL_EXTENDED_DN_OID);
+
+       /* if the client sent us the EXTENDED_DN control then we need
+          to expand the DNs to have GUID and SID. W2K8 join relies on
+          this */
+       if (edn_control) {
+               int i, ret;
+               for (i=0; dn_attrs[i]; i++) {
+                       if (!do_attribute(attrs, dn_attrs[i])) continue;
+                       ret = expand_dn_in_message(module, msg, dn_attrs[i],
+                                                  edn_control, req);
+                       if (ret != LDB_SUCCESS) {
+                               DEBUG(0,(__location__ ": Failed to expand DN in rootDSE for %s\n",
+                                        dn_attrs[i]));
+                               goto failed;
+                       }
+               }
+       }
+
+       if (do_attribute(attrs, "isGlobalCatalogReady")) {
+               /* MS-ADTS 3.1.1.3.2.10
+                  Note, we should only return true here is we have
+                  completed at least one synchronisation. As both
+                  provision and vampire do a full sync, this means we
+                  can return true is the gc bit is set in the NTDSDSA
+                  options */
+               if (ldb_msg_add_fmt(msg, "isGlobalCatalogReady",
+                                   "%s", samdb_is_gc(ldb)?"TRUE":"FALSE") != 0) {
+                       goto failed;
+               }
+       }
+
        /* TODO: lots more dynamic attributes should be added here */
 
        return LDB_SUCCESS;
@@ -221,101 +391,121 @@ failed:
 
 struct rootdse_context {
        struct ldb_module *module;
-       void *up_context;
-       int (*up_callback)(struct ldb_context *, void *, struct ldb_reply *);
-
-       const char * const * attrs;
+       struct ldb_request *req;
 };
 
-static int rootdse_callback(struct ldb_context *ldb, void *context, struct ldb_reply *ares)
+static struct rootdse_context *rootdse_init_context(struct ldb_module *module,
+                                                   struct ldb_request *req)
+{
+       struct ldb_context *ldb;
+       struct rootdse_context *ac;
+
+       ldb = ldb_module_get_ctx(module);
+
+       ac = talloc_zero(req, struct rootdse_context);
+       if (ac == NULL) {
+               ldb_set_errstring(ldb, "Out of Memory");
+               return NULL;
+       }
+
+       ac->module = module;
+       ac->req = req;
+
+       return ac;
+}
+
+static int rootdse_callback(struct ldb_request *req, struct ldb_reply *ares)
 {
        struct rootdse_context *ac;
+       int ret;
 
-       ac = talloc_get_type(context, struct rootdse_context);
+       ac = talloc_get_type(req->context, struct rootdse_context);
 
-       if (ares->type == LDB_REPLY_ENTRY) {
+       if (!ares) {
+               return ldb_module_done(ac->req, NULL, NULL,
+                                       LDB_ERR_OPERATIONS_ERROR);
+       }
+       if (ares->error != LDB_SUCCESS) {
+               return ldb_module_done(ac->req, ares->controls,
+                                       ares->response, ares->error);
+       }
+
+       switch (ares->type) {
+       case LDB_REPLY_ENTRY:
                /*
                 * if the client explicit asks for the 'netlogon' attribute
                 * the reply_entry needs to be skipped
                 */
-               if (ac->attrs && ldb_attr_in_list(ac->attrs, "netlogon")) {
+               if (ac->req->op.search.attrs &&
+                   ldb_attr_in_list(ac->req->op.search.attrs, "netlogon")) {
                        talloc_free(ares);
                        return LDB_SUCCESS;
                }
 
                /* for each record returned post-process to add any dynamic
                   attributes that have been asked for */
-               if (rootdse_add_dynamic(ac->module, ares->message, ac->attrs) != LDB_SUCCESS) {
-                       goto error;
+               ret = rootdse_add_dynamic(ac->module, ares->message,
+                                         ac->req->op.search.attrs, ac->req);
+               if (ret != LDB_SUCCESS) {
+                       talloc_free(ares);
+                       return ldb_module_done(ac->req, NULL, NULL, ret);
                }
-       }
 
-       return ac->up_callback(ldb, ac->up_context, ares);
+               return ldb_module_send_entry(ac->req, ares->message, ares->controls);
+
+       case LDB_REPLY_REFERRAL:
+               /* should we allow the backend to return referrals in this case
+                * ?? */
+               break;
+
+       case LDB_REPLY_DONE:
+               return ldb_module_done(ac->req, ares->controls,
+                                       ares->response, ares->error);
+       }
 
-error:
        talloc_free(ares);
-       return LDB_ERR_OPERATIONS_ERROR;
+       return LDB_SUCCESS;
 }
 
 static int rootdse_search(struct ldb_module *module, struct ldb_request *req)
 {
+       struct ldb_context *ldb;
        struct rootdse_context *ac;
        struct ldb_request *down_req;
        int ret;
 
-       /* see if its for the rootDSE */
-       if (req->op.search.scope != LDB_SCOPE_BASE ||
-           ( ! ldb_dn_is_null(req->op.search.base))) {
+       ldb = ldb_module_get_ctx(module);
+
+       /* see if its for the rootDSE - only a base search on the "" DN qualifies */
+       if (!(req->op.search.scope == LDB_SCOPE_BASE && ldb_dn_is_null(req->op.search.base))) {
+               /* Otherwise, pass down to the rest of the stack */
                return ldb_next_request(module, req);
        }
 
-       ac = talloc(req, struct rootdse_context);
+       ac = rootdse_init_context(module, req);
        if (ac == NULL) {
                return LDB_ERR_OPERATIONS_ERROR;
        }
 
-       ac->module = module;
-       ac->up_context = req->context;
-       ac->up_callback = req->callback;
-       ac->attrs = req->op.search.attrs;
-
-       down_req = talloc_zero(req, struct ldb_request);
-       if (down_req == NULL) {
-               return LDB_ERR_OPERATIONS_ERROR;
-       }
-
-       down_req->operation = req->operation;
        /* in our db we store the rootDSE with a DN of @ROOTDSE */
-       down_req->op.search.base = ldb_dn_new(down_req, module->ldb, "@ROOTDSE");
-       down_req->op.search.scope = LDB_SCOPE_BASE;
-       down_req->op.search.tree = ldb_parse_tree(down_req, NULL);
-       if (down_req->op.search.base == NULL || down_req->op.search.tree == NULL) {
-               ldb_oom(module->ldb);
-               talloc_free(down_req);
-               return LDB_ERR_OPERATIONS_ERROR;
-       }
-       down_req->op.search.attrs = req->op.search.attrs;
-       down_req->controls = req->controls;
-
-       down_req->context = ac;
-       down_req->callback = rootdse_callback;
-       ldb_set_timeout_from_prev_req(module->ldb, req, down_req);
-
-       /* perform the search */
-       ret = ldb_next_request(module, down_req);
-
-       /* do not free down_req as the call results may be linked to it,
-        * it will be freed when the upper level request get freed */
-       if (ret == LDB_SUCCESS) {
-               req->handle = down_req->handle;
+       ret = ldb_build_search_req(&down_req, ldb, ac,
+                                       ldb_dn_new(ac, ldb, "@ROOTDSE"),
+                                       LDB_SCOPE_BASE,
+                                       NULL,
+                                       req->op.search.attrs,
+                                       NULL,/* for now skip the controls from the client */
+                                       ac, rootdse_callback,
+                                       req);
+       if (ret != LDB_SUCCESS) {
+               return ret;
        }
 
-       return ret;
+       return ldb_next_request(module, down_req);
 }
 
 static int rootdse_register_control(struct ldb_module *module, struct ldb_request *req)
 {
-       struct private_data *priv = talloc_get_type(module->private_data, struct private_data);
+       struct private_data *priv = talloc_get_type(ldb_module_get_private(module), struct private_data);
        char **list;
 
        list = talloc_realloc(priv, priv->controls, char *, priv->num_controls + 1);
@@ -331,12 +521,12 @@ static int rootdse_register_control(struct ldb_module *module, struct ldb_reques
        priv->num_controls += 1;
        priv->controls = list;
 
-       return LDB_SUCCESS;
+       return ldb_module_done(req, NULL, NULL, LDB_SUCCESS);
 }
+
 static int rootdse_register_partition(struct ldb_module *module, struct ldb_request *req)
 {
-       struct private_data *priv = talloc_get_type(module->private_data, struct private_data);
+       struct private_data *priv = talloc_get_type(ldb_module_get_private(module), struct private_data);
        struct ldb_dn **list;
 
        list = talloc_realloc(priv, priv->partitions, struct ldb_dn *, priv->num_partitions + 1);
@@ -352,9 +542,9 @@ static int rootdse_register_partition(struct ldb_module *module, struct ldb_requ
        priv->num_partitions += 1;
        priv->partitions = list;
 
-       return LDB_SUCCESS;
+       return ldb_module_done(req, NULL, NULL, LDB_SUCCESS);
 }
+
 
 static int rootdse_request(struct ldb_module *module, struct ldb_request *req)
 {
@@ -373,9 +563,17 @@ static int rootdse_request(struct ldb_module *module, struct ldb_request *req)
 
 static int rootdse_init(struct ldb_module *module)
 {
+       int ret;
+       struct ldb_context *ldb;
+       struct ldb_result *res;
        struct private_data *data;
+       const char *attrs[] = { "msDS-Behavior-Version", NULL };
+       const char *ds_attrs[] = { "dsServiceName", NULL };
+       TALLOC_CTX *mem_ctx;
+
+       ldb = ldb_module_get_ctx(module);
 
-       data = talloc(module, struct private_data);
+       data = talloc_zero(module, struct private_data);
        if (data == NULL) {
                return -1;
        }
@@ -384,15 +582,116 @@ static int rootdse_init(struct ldb_module *module)
        data->controls = NULL;
        data->num_partitions = 0;
        data->partitions = NULL;
-       module->private_data = data;
+       ldb_module_set_private(module, data);
 
-       ldb_set_default_dns(module->ldb);
+       ldb_set_default_dns(ldb);
 
-       return ldb_next_init(module);
+       ret = ldb_next_init(module);
+
+       if (ret) {
+               return ret;
+       }
+
+       mem_ctx = talloc_new(data);
+       if (!mem_ctx) {
+               ldb_oom(ldb);
+               return LDB_ERR_OPERATIONS_ERROR;
+       }
+
+       /* Now that the partitions are set up, do a search for:
+          - domainControllerFunctionality
+          - domainFunctionality
+          - forestFunctionality
+
+          Then stuff these values into an opaque
+       */
+       ret = ldb_search(ldb, mem_ctx, &res,
+                        ldb_get_default_basedn(ldb),
+                        LDB_SCOPE_BASE, attrs, NULL);
+       if (ret == LDB_SUCCESS && res->count == 1) {
+               int domain_behaviour_version
+                       = ldb_msg_find_attr_as_int(res->msgs[0], 
+                                                  "msDS-Behavior-Version", -1);
+               if (domain_behaviour_version != -1) {
+                       int *val = talloc(ldb, int);
+                       if (!val) {
+                               ldb_oom(ldb);
+                               talloc_free(mem_ctx);
+                               return LDB_ERR_OPERATIONS_ERROR;
+                       }
+                       *val = domain_behaviour_version;
+                       ret = ldb_set_opaque(ldb, "domainFunctionality", val);
+                       if (ret != LDB_SUCCESS) {
+                               talloc_free(mem_ctx);
+                               return ret;
+                       }
+               }
+       }
+
+       ret = ldb_search(ldb, mem_ctx, &res,
+                        samdb_partitions_dn(ldb, mem_ctx),
+                        LDB_SCOPE_BASE, attrs, NULL);
+       if (ret == LDB_SUCCESS && res->count == 1) {
+               int forest_behaviour_version
+                       = ldb_msg_find_attr_as_int(res->msgs[0], 
+                                                  "msDS-Behavior-Version", -1);
+               if (forest_behaviour_version != -1) {
+                       int *val = talloc(ldb, int);
+                       if (!val) {
+                               ldb_oom(ldb);
+                               talloc_free(mem_ctx);
+                               return LDB_ERR_OPERATIONS_ERROR;
+                       }
+                       *val = forest_behaviour_version;
+                       ret = ldb_set_opaque(ldb, "forestFunctionality", val);
+                       if (ret != LDB_SUCCESS) {
+                               talloc_free(mem_ctx);
+                               return ret;
+                       }
+               }
+       }
+
+       ret = ldb_search(ldb, mem_ctx, &res,
+                        ldb_dn_new(mem_ctx, ldb, ""),
+                        LDB_SCOPE_BASE, ds_attrs, NULL);
+       if (ret == LDB_SUCCESS && res->count == 1) {
+               struct ldb_dn *ds_dn
+                       = ldb_msg_find_attr_as_dn(ldb, mem_ctx, res->msgs[0], 
+                                                 "dsServiceName");
+               if (ds_dn) {
+                       ret = ldb_search(ldb, mem_ctx, &res, ds_dn, 
+                                        LDB_SCOPE_BASE, attrs, NULL);
+                       if (ret == LDB_SUCCESS && res->count == 1) {
+                               int domain_controller_behaviour_version
+                                       = ldb_msg_find_attr_as_int(res->msgs[0], 
+                                                                  "msDS-Behavior-Version", -1);
+                               if (domain_controller_behaviour_version != -1) {
+                                       int *val = talloc(ldb, int);
+                                       if (!val) {
+                                               ldb_oom(ldb);
+                                               talloc_free(mem_ctx);
+                                       return LDB_ERR_OPERATIONS_ERROR;
+                                       }
+                                       *val = domain_controller_behaviour_version;
+                                       ret = ldb_set_opaque(ldb, 
+                                                            "domainControllerFunctionality", val);
+                                       if (ret != LDB_SUCCESS) {
+                                               talloc_free(mem_ctx);
+                                               return ret;
+                                       }
+                               }
+                       }
+               }
+       }
+
+       talloc_free(mem_ctx);
+       
+       return LDB_SUCCESS;
 }
 
 static int rootdse_modify(struct ldb_module *module, struct ldb_request *req)
 {
+       struct ldb_context *ldb;
        struct ldb_result *ext_res;
        int ret;
        struct ldb_dn *schema_dn;
@@ -404,7 +703,9 @@ static int rootdse_modify(struct ldb_module *module, struct ldb_request *req)
        if (!ldb_dn_is_null(req->op.mod.message->dn)) {
                return ldb_next_request(module, req);
        }
-       
+
+       ldb = ldb_module_get_ctx(module);
+
        /*
                dn is empty so check for schemaUpdateNow attribute
                "The type of modification and values specified in the LDAP modify operation do not matter." MSDN
@@ -414,27 +715,27 @@ static int rootdse_modify(struct ldb_module *module, struct ldb_request *req)
                return LDB_ERR_OPERATIONS_ERROR;
        }
 
-       schema_dn = samdb_schema_dn(module->ldb);
+       schema_dn = samdb_schema_dn(ldb);
        if (!schema_dn) {
-               ldb_reset_err_string(module->ldb);
-               ldb_debug(module->ldb, LDB_DEBUG_WARNING,
+               ldb_reset_err_string(ldb);
+               ldb_debug(ldb, LDB_DEBUG_WARNING,
                          "rootdse_modify: no schema dn present: (skip ldb_extended call)\n");
                return ldb_next_request(module, req);
        }
 
-       ret = ldb_extended(module->ldb, DSDB_EXTENDED_SCHEMA_UPDATE_NOW_OID, schema_dn, &ext_res);
+       ret = ldb_extended(ldb, DSDB_EXTENDED_SCHEMA_UPDATE_NOW_OID, schema_dn, &ext_res);
        if (ret != LDB_SUCCESS) {
                return LDB_ERR_OPERATIONS_ERROR;
        }
        
        talloc_free(ext_res);
-       return ret;
+       return ldb_module_done(req, NULL, NULL, ret);
 }
 
 _PUBLIC_ const struct ldb_module_ops ldb_rootdse_module_ops = {
-       .name                   = "rootdse",
+       .name           = "rootdse",
        .init_context   = rootdse_init,
        .search         = rootdse_search,
-       .request                = rootdse_request,
+       .request        = rootdse_request,
        .modify         = rootdse_modify
 };