summaryrefslogtreecommitdiff
path: root/source4/lib
diff options
context:
space:
mode:
Diffstat (limited to 'source4/lib')
-rw-r--r--source4/lib/ldb/common/ldb_modules.c10
-rw-r--r--source4/lib/ldb/config.mk9
-rw-r--r--source4/lib/ldb/modules/rdn_name.c276
-rw-r--r--source4/lib/ldb/modules/timestamps.c37
4 files changed, 311 insertions, 21 deletions
diff --git a/source4/lib/ldb/common/ldb_modules.c b/source4/lib/ldb/common/ldb_modules.c
index dc1a90ebc2..d6213be79a 100644
--- a/source4/lib/ldb/common/ldb_modules.c
+++ b/source4/lib/ldb/common/ldb_modules.c
@@ -199,6 +199,16 @@ int ldb_load_modules(struct ldb_context *ldb, const char *options[])
continue;
}
+ if (strcmp(modules[i], "rdn_name") == 0) {
+ current = rdn_name_module_init(ldb, options);
+ if (!current) {
+ ldb_debug(ldb, LDB_DEBUG_FATAL, "function 'init_module' in %s fails\n", modules[i]);
+ return -1;
+ }
+ DLIST_ADD(ldb->modules, current);
+ continue;
+ }
+
#ifdef _SAMBA_BUILD_
if (strcmp(modules[i], "samldb") == 0) {
current = samldb_module_init(ldb, options);
diff --git a/source4/lib/ldb/config.mk b/source4/lib/ldb/config.mk
index 39bf004e5d..fe339f9e17 100644
--- a/source4/lib/ldb/config.mk
+++ b/source4/lib/ldb/config.mk
@@ -17,6 +17,15 @@ INIT_OBJ_FILES = \
################################################
################################################
+# Start MODULE libldb_rdn_name
+[MODULE::libldb_rdn_name]
+SUBSYSTEM = LIBLDB
+INIT_OBJ_FILES = \
+ lib/ldb/modules/rdn_name.o
+# End MODULE libldb_rdn_name
+################################################
+
+################################################
# Start MODULE libldb_schema
[MODULE::libldb_schema]
SUBSYSTEM = LIBLDB
diff --git a/source4/lib/ldb/modules/rdn_name.c b/source4/lib/ldb/modules/rdn_name.c
new file mode 100644
index 0000000000..6a11ab87fe
--- /dev/null
+++ b/source4/lib/ldb/modules/rdn_name.c
@@ -0,0 +1,276 @@
+/*
+ ldb database library
+
+ Copyright (C) Simo Sorce 2004
+
+ ** 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 2 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, write to the Free Software
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+*/
+
+/*
+ * Name: ldb
+ *
+ * Component: ldb objectguid module
+ *
+ * Description: add a unique objectGUID onto every new record
+ *
+ * Author: Simo Sorce
+ */
+
+#include "includes.h"
+#include "ldb/include/ldb.h"
+#include "ldb/include/ldb_private.h"
+#include <time.h>
+
+struct private_data {
+ const char *error_string;
+};
+
+static int rdn_name_search(struct ldb_module *module, const char *base,
+ enum ldb_scope scope, const char *expression,
+ const char * const *attrs, struct ldb_message ***res)
+{
+ ldb_debug(module->ldb, LDB_DEBUG_TRACE, "rdn_name_search\n");
+ return ldb_next_search(module, base, scope, expression, attrs, res);
+}
+
+static int rdn_name_search_bytree(struct ldb_module *module, const char *base,
+ enum ldb_scope scope, struct ldb_parse_tree *tree,
+ const char * const *attrs, struct ldb_message ***res)
+{
+ ldb_debug(module->ldb, LDB_DEBUG_TRACE, "rdn_name_search\n");
+ return ldb_next_search_bytree(module, base, scope, tree, attrs, res);
+}
+
+static struct ldb_message_element *rdn_name_find_attribute(const struct ldb_message *msg, const char *name)
+{
+ int i;
+
+ for (i = 0; i < msg->num_elements; i++) {
+ if (ldb_attr_cmp(name, msg->elements[i].name) == 0) {
+ return &msg->elements[i];
+ }
+ }
+
+ return NULL;
+}
+
+static struct ldb_dn_component *get_rdn(void *mem_ctx, const char *dn)
+{
+ struct ldb_dn *dn_exploded = ldb_dn_explode(mem_ctx, dn);
+
+ if (!dn_exploded) {
+ return NULL;
+ }
+
+ if (dn_exploded->comp_num < 1) {
+ return NULL;
+ }
+
+ return &dn_exploded->components[0];
+}
+
+/* add_record: add crateTimestamp/modifyTimestamp attributes */
+static int rdn_name_add_record(struct ldb_module *module, const struct ldb_message *msg)
+{
+ struct ldb_message *msg2;
+ struct ldb_message_element *attribute;
+ struct ldb_dn_component *rdn;
+ int ret, i;
+
+ ldb_debug(module->ldb, LDB_DEBUG_TRACE, "rdn_name_add_record\n");
+
+ if (msg->dn[0] == '@') { /* do not manipulate our control entries */
+ return ldb_next_add_record(module, msg);
+ }
+
+ /* Perhaps someone above us knows better */
+ if ((attribute = rdn_name_find_attribute(msg, "name")) != NULL ) {
+ return ldb_next_add_record(module, msg);
+ }
+
+ msg2 = talloc(module, struct ldb_message);
+ if (!msg2) {
+ return -1;
+ }
+
+ msg2->dn = msg->dn;
+ msg2->num_elements = msg->num_elements;
+ msg2->private_data = msg->private_data;
+ msg2->elements = talloc_array(msg2, struct ldb_message_element, msg2->num_elements);
+ for (i = 0; i < msg2->num_elements; i++) {
+ msg2->elements[i] = msg->elements[i];
+ }
+
+ rdn = get_rdn(msg2, msg2->dn);
+ if (!rdn) {
+ return -1;
+ }
+
+ if (ldb_msg_add_value(module->ldb, msg2, "name", &rdn->value) != 0) {
+ return -1;
+ }
+
+ ret = ldb_next_add_record(module, msg2);
+ talloc_free(msg2);
+
+ return ret;
+}
+
+/* modify_record: change modifyTimestamp as well */
+static int rdn_name_modify_record(struct ldb_module *module, const struct ldb_message *msg)
+{
+ struct ldb_message *msg2;
+ struct ldb_message_element *attribute;
+ struct ldb_dn_component *rdn;
+ int ret, i;
+
+ ldb_debug(module->ldb, LDB_DEBUG_TRACE, "rdn_name_modify_record\n");
+
+ /* Perhaps someone above us knows better */
+ if ((attribute = rdn_name_find_attribute(msg, "name")) != NULL ) {
+ return ldb_next_add_record(module, msg);
+ }
+
+ msg2 = talloc(module, struct ldb_message);
+ if (!msg2) {
+ return -1;
+ }
+
+ msg2->dn = msg->dn;
+ msg2->num_elements = msg->num_elements;
+ msg2->private_data = msg->private_data;
+ msg2->elements = talloc_array(msg2, struct ldb_message_element, msg2->num_elements);
+ for (i = 0; i < msg2->num_elements; i++) {
+ msg2->elements[i] = msg->elements[i];
+ }
+
+ rdn = get_rdn(msg2, msg2->dn);
+ if (!rdn) {
+ return -1;
+ }
+
+ if (ldb_msg_add_value(module->ldb, msg2, "name", &rdn->value) != 0) {
+ return -1;
+ }
+
+ attribute = rdn_name_find_attribute(msg2, "name");
+ if (!attribute) {
+ return -1;
+ }
+
+ attribute->flags = LDB_FLAG_MOD_REPLACE;
+
+ ret = ldb_next_modify_record(module, msg2);
+ talloc_free(msg2);
+
+ return ret;
+}
+
+static int rdn_name_delete_record(struct ldb_module *module, const char *dn)
+{
+ ldb_debug(module->ldb, LDB_DEBUG_TRACE, "rdn_name_delete_record\n");
+ return ldb_next_delete_record(module, dn);
+}
+
+static int rdn_name_rename_record(struct ldb_module *module, const char *olddn, const char *newdn)
+{
+ ldb_debug(module->ldb, LDB_DEBUG_TRACE, "rdn_name_rename_record\n");
+ return ldb_next_rename_record(module, olddn, newdn);
+}
+
+static int rdn_name_lock(struct ldb_module *module, const char *lockname)
+{
+ ldb_debug(module->ldb, LDB_DEBUG_TRACE, "rdn_name_lock\n");
+ return ldb_next_named_lock(module, lockname);
+}
+
+static int rdn_name_unlock(struct ldb_module *module, const char *lockname)
+{
+ ldb_debug(module->ldb, LDB_DEBUG_TRACE, "rdn_name_unlock\n");
+ return ldb_next_named_unlock(module, lockname);
+}
+
+/* return extended error information */
+static const char *rdn_name_errstring(struct ldb_module *module)
+{
+ struct private_data *data = (struct private_data *)module->private_data;
+
+ ldb_debug(module->ldb, LDB_DEBUG_TRACE, "rdn_name_errstring\n");
+ if (data->error_string) {
+ const char *error;
+
+ error = data->error_string;
+ data->error_string = NULL;
+ return error;
+ }
+
+ return ldb_next_errstring(module);
+}
+
+static int rdn_name_destructor(void *module_ctx)
+{
+ /* struct ldb_module *ctx = module_ctx; */
+ /* put your clean-up functions here */
+ return 0;
+}
+
+static const struct ldb_module_ops rdn_name_ops = {
+ .name = "rdn_name",
+ .search = rdn_name_search,
+ .search_bytree = rdn_name_search_bytree,
+ .add_record = rdn_name_add_record,
+ .modify_record = rdn_name_modify_record,
+ .delete_record = rdn_name_delete_record,
+ .rename_record = rdn_name_rename_record,
+ .named_lock = rdn_name_lock,
+ .named_unlock = rdn_name_unlock,
+ .errstring = rdn_name_errstring
+};
+
+
+/* the init function */
+#ifdef HAVE_DLOPEN_DISABLED
+ struct ldb_module *init_module(struct ldb_context *ldb, const char *options[])
+#else
+struct ldb_module *rdn_name_module_init(struct ldb_context *ldb, const char *options[])
+#endif
+{
+ struct ldb_module *ctx;
+ struct private_data *data;
+
+ ctx = talloc(ldb, struct ldb_module);
+ if (!ctx)
+ return NULL;
+
+ data = talloc(ctx, struct private_data);
+ if (!data) {
+ talloc_free(ctx);
+ return NULL;
+ }
+
+ data->error_string = NULL;
+ ctx->private_data = data;
+ ctx->ldb = ldb;
+ ctx->prev = ctx->next = NULL;
+ ctx->ops = &rdn_name_ops;
+
+ talloc_set_destructor (ctx, rdn_name_destructor);
+
+ return ctx;
+}
diff --git a/source4/lib/ldb/modules/timestamps.c b/source4/lib/ldb/modules/timestamps.c
index c1db85a284..b067d8e8d6 100644
--- a/source4/lib/ldb/modules/timestamps.c
+++ b/source4/lib/ldb/modules/timestamps.c
@@ -60,8 +60,8 @@ static int timestamps_search_bytree(struct ldb_module *module, const char *base,
static int add_time_element(struct ldb_module *module, struct ldb_message *msg,
const char *attr_name, const char *time_string, unsigned int flags)
{
- struct ldb_val *values;
- char *name, *timestr;
+ struct ldb_message_element *attribute = NULL;
+
int i;
for (i = 0; i < msg->num_elements; i++) {
@@ -70,23 +70,22 @@ static int add_time_element(struct ldb_module *module, struct ldb_message *msg,
}
}
- msg->elements = talloc_realloc(msg, msg->elements,
- struct ldb_message_element, msg->num_elements + 1);
- name = talloc_strdup(msg->elements, attr_name);
- timestr = talloc_strdup(msg->elements, time_string);
- values = talloc(msg->elements, struct ldb_val);
- if (!msg->elements || !name || !timestr || !values) {
+ if (ldb_msg_add_string(module->ldb, msg, attr_name, time_string) != 0) {
return -1;
}
- msg->elements[msg->num_elements].name = name;
- msg->elements[msg->num_elements].flags = flags;
- msg->elements[msg->num_elements].num_values = 1;
- msg->elements[msg->num_elements].values = values;
- msg->elements[msg->num_elements].values[0].data = timestr;
- msg->elements[msg->num_elements].values[0].length = strlen(timestr);
+ for (i = 0; i < msg->num_elements; i++) {
+ if (ldb_attr_cmp(attr_name, msg->elements[i].name) == 0) {
+ attribute = &msg->elements[i];
+ break;
+ }
+ }
- msg->num_elements += 1;
+ if (!attribute) {
+ return -1;
+ }
+
+ attribute->flags = flags;
return 0;
}
@@ -196,12 +195,8 @@ static int timestamps_modify_record(struct ldb_module *module, const struct ldb_
add_time_element(module, msg2, "modifyTimestamp", timestr, LDB_FLAG_MOD_REPLACE);
add_time_element(module, msg2, "whenChanged", timestr, LDB_FLAG_MOD_REPLACE);
- if (msg2) {
- ret = ldb_next_modify_record(module, msg2);
- talloc_free(msg2);
- } else {
- ret = ldb_next_modify_record(module, msg);
- }
+ ret = ldb_next_modify_record(module, msg2);
+ talloc_free(msg2);
return ret;
}
generated by cgit (git 2.34.1) at 2024-11-03 14:25:29 +0000