Add in a new module to handle instanceType
authorAndrew Bartlett <abartlet@samba.org>
Thu, 17 Jan 2008 23:13:43 +0000 (10:13 +1100)
committerAndrew Bartlett <abartlet@samba.org>
Thu, 17 Jan 2008 23:13:43 +0000 (10:13 +1100)
This code raided from the repl_meta_data module, which probably needs
to be downsized to just handling the replication data.

Andrew Bartlett

source/dsdb/samdb/ldb_modules/config.mk
source/dsdb/samdb/ldb_modules/instancetype.c [new file with mode: 0644]
source/scripting/libjs/provision.js

index a41a29b5dd4bad5af2429a1e8396540f0347dcc7..dc407fbd8a9a049b0c8618dc86941d6ff7547852 100644 (file)
@@ -333,3 +333,16 @@ OBJ_FILES = \
 # End MODULE ldb_normalise
 ################################################
 
+################################################
+# Start MODULE ldb_instancetype
+[MODULE::ldb_instancetype]
+INIT_FUNCTION = ldb_instancetype_init
+CFLAGS = -Ilib/ldb/include
+OUTPUT_TYPE = SHARED_LIBRARY
+PRIVATE_DEPENDENCIES = LIBTALLOC
+SUBSYSTEM = LIBLDB
+OBJ_FILES = \
+               instancetype.o
+# End MODULE ldb_instancetype
+################################################
+
diff --git a/source/dsdb/samdb/ldb_modules/instancetype.c b/source/dsdb/samdb/ldb_modules/instancetype.c
new file mode 100644 (file)
index 0000000..ee1f2ff
--- /dev/null
@@ -0,0 +1,128 @@
+/* 
+   ldb database library
+
+   Copyright (C) Simo Sorce  2004-2006
+   Copyright (C) Andrew Bartlett <abartlet@samba.org> 2005
+   Copyright (C) Andrew Tridgell 2005
+   Copyright (C) Stefan Metzmacher <metze@samba.org> 2007
+
+     ** NOTE! The following LGPL license applies to the ldb
+     ** library. This does NOT imply that all of Samba is released
+     ** under the LGPL
+   
+   This library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 3 of the License, or (at your option) any later version.
+
+   This library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with this library; if not, see <http://www.gnu.org/licenses/>.
+*/
+
+/*
+ *  Name: ldb
+ *
+ *  Component: ldb instancetype module
+ *
+ *  Description: add an instanceType onto every new record
+ *
+ *  Author: Simo Sorce
+ */
+
+#include "includes.h"
+#include "ldb/include/ldb_includes.h"
+#include "librpc/gen_ndr/ndr_misc.h"
+#include "param/param.h"
+#include "dsdb/samdb/samdb.h"
+#include "dsdb/common/flags.h"
+
+/* add_record: add instancetype attribute */
+static int instancetype_add(struct ldb_module *module, struct ldb_request *req)
+{
+       struct ldb_request *down_req;
+       struct ldb_message *msg;
+       uint32_t instance_type;
+       int ret;
+       const struct ldb_control *partition_ctrl;
+       const struct dsdb_control_current_partition *partition;
+
+       ldb_debug(module->ldb, LDB_DEBUG_TRACE, "instancetype_add_record\n");
+
+       /* do not manipulate our control entries */
+       if (ldb_dn_is_special(req->op.add.message->dn)) {
+               return ldb_next_request(module, req);
+       }
+
+       partition_ctrl = ldb_request_get_control(req, DSDB_CONTROL_CURRENT_PARTITION_OID);
+       if (!partition_ctrl) {
+               ldb_debug_set(module->ldb, LDB_DEBUG_FATAL,
+                             "instancetype_add: no current partition control found");
+               return LDB_ERR_CONSTRAINT_VIOLATION;
+       }
+
+       partition = talloc_get_type(partition_ctrl->data,
+                                   struct dsdb_control_current_partition);
+       SMB_ASSERT(partition && partition->version == DSDB_CONTROL_CURRENT_PARTITION_VERSION);
+
+       down_req = talloc(req, struct ldb_request);
+       if (down_req == NULL) {
+               return LDB_ERR_OPERATIONS_ERROR;
+       }
+
+       *down_req = *req;
+
+       /* we have to copy the message as the caller might have it as a const */
+       down_req->op.add.message = msg = ldb_msg_copy_shallow(down_req, req->op.add.message);
+       if (msg == NULL) {
+               talloc_free(down_req);
+               return LDB_ERR_OPERATIONS_ERROR;
+       }
+
+       /*
+        * TODO: calculate correct instance type
+        */
+       instance_type = INSTANCE_TYPE_WRITE;
+       if (ldb_dn_compare(partition->dn, msg->dn) == 0) {
+               instance_type |= INSTANCE_TYPE_IS_NC_HEAD;
+               if (ldb_dn_compare(msg->dn, samdb_base_dn(module->ldb)) != 0) {
+                       instance_type |= INSTANCE_TYPE_NC_ABOVE;
+               }
+       }
+
+       ret = ldb_msg_add_fmt(msg, "instanceType", "%u", instance_type);
+       if (ret != LDB_SUCCESS) {
+               talloc_free(down_req);
+               ldb_oom(module->ldb);
+               return LDB_ERR_OPERATIONS_ERROR;
+       }
+
+       ldb_set_timeout_from_prev_req(module->ldb, req, down_req);
+
+       /* go on with the call chain */
+       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;
+       }
+
+       return ret;
+}
+
+static const struct ldb_module_ops instancetype_ops = {
+       .name          = "instancetype",
+       .add           = instancetype_add,
+};
+
+
+int ldb_instancetype_init(void)
+{
+       return ldb_register_module(&instancetype_ops);
+}
index 381288417a301c049c58f8419170d1772f297802..0cca49dec912488a494c95cd236bd4880fece22d 100644 (file)
@@ -1013,9 +1013,9 @@ function provision_guess()
        subobj.DOMAINDN_LDB = "users.ldb";
        subobj.CONFIGDN_LDB = "configuration.ldb";
        subobj.SCHEMADN_LDB = "schema.ldb";
-       subobj.DOMAINDN_MOD = "pdc_fsmo,password_hash";
-       subobj.CONFIGDN_MOD = "naming_fsmo";
-       subobj.SCHEMADN_MOD = "schema_fsmo";
+       subobj.DOMAINDN_MOD = "pdc_fsmo,password_hash,instancetype";
+       subobj.CONFIGDN_MOD = "naming_fsmo,instancetype";
+       subobj.SCHEMADN_MOD = "schema_fsmo,instancetype";
        subobj.DOMAINDN_MOD2 = ",objectguid";
        subobj.CONFIGDN_MOD2 = ",objectguid";
        subobj.SCHEMADN_MOD2 = ",objectguid";