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/objectguid.c220
3 files changed, 5 insertions, 234 deletions
diff --git a/source4/lib/ldb/common/ldb_modules.c b/source4/lib/ldb/common/ldb_modules.c
index d6213be79a..dcc384ffad 100644
--- a/source4/lib/ldb/common/ldb_modules.c
+++ b/source4/lib/ldb/common/ldb_modules.c
@@ -189,8 +189,8 @@ int ldb_load_modules(struct ldb_context *ldb, const char *options[])
continue;
}
- if (strcmp(modules[i], "objectguid") == 0) {
- current = objectguid_module_init(ldb, options);
+ 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;
@@ -199,8 +199,9 @@ 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);
+#ifdef _SAMBA_BUILD_
+ if (strcmp(modules[i], "objectguid") == 0) {
+ current = objectguid_module_init(ldb, options);
if (!current) {
ldb_debug(ldb, LDB_DEBUG_FATAL, "function 'init_module' in %s fails\n", modules[i]);
return -1;
@@ -209,7 +210,6 @@ int ldb_load_modules(struct ldb_context *ldb, const char *options[])
continue;
}
-#ifdef _SAMBA_BUILD_
if (strcmp(modules[i], "samldb") == 0) {
current = samldb_module_init(ldb, options);
if (!current) {
diff --git a/source4/lib/ldb/config.mk b/source4/lib/ldb/config.mk
index fe339f9e17..87e15f1375 100644
--- a/source4/lib/ldb/config.mk
+++ b/source4/lib/ldb/config.mk
@@ -8,15 +8,6 @@ INIT_OBJ_FILES = \
################################################
################################################
-# Start MODULE libldb_objectguid
-[MODULE::libldb_objectguid]
-SUBSYSTEM = LIBLDB
-INIT_OBJ_FILES = \
- lib/ldb/modules/objectguid.o
-# End MODULE libldb_objectguid
-################################################
-
-################################################
# Start MODULE libldb_rdn_name
[MODULE::libldb_rdn_name]
SUBSYSTEM = LIBLDB
diff --git a/source4/lib/ldb/modules/objectguid.c b/source4/lib/ldb/modules/objectguid.c
deleted file mode 100644
index 0e789c2bda..0000000000
--- a/source4/lib/ldb/modules/objectguid.c
+++ /dev/null
@@ -1,220 +0,0 @@
-/*
- 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 objectguid_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, "objectguid_search\n");
- return ldb_next_search(module, base, scope, expression, attrs, res);
-}
-
-static int objectguid_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, "objectguid_search\n");
- return ldb_next_search_bytree(module, base, scope, tree, attrs, res);
-}
-
-static struct ldb_message_element *objectguid_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;
-}
-
-/* add_record: add crateTimestamp/modifyTimestamp attributes */
-static int objectguid_add_record(struct ldb_module *module, const struct ldb_message *msg)
-{
- struct ldb_message *msg2;
- struct ldb_message_element *attribute;
- struct GUID guid;
- char *guidstr;
- int ret, i;
-
- ldb_debug(module->ldb, LDB_DEBUG_TRACE, "objectguid_add_record\n");
-
- if (msg->dn[0] == '@') { /* do not manipulate our control entries */
- return ldb_next_add_record(module, msg);
- }
-
- if ((attribute = objectguid_find_attribute(msg, "objectGUID")) != 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];
- }
-
- /* a new GUID */
- guid = GUID_random();
- guidstr = GUID_string(msg2, &guid);
- if (!guidstr) {
- return -1;
- }
-
- if (ldb_msg_add_string(module->ldb, msg2, "objectGUID", guidstr) != 0) {
- return -1;
- }
-
- ret = ldb_next_add_record(module, msg2);
- talloc_free(msg2);
-
- return ret;
-}
-
-/* modify_record: change modifyTimestamp as well */
-static int objectguid_modify_record(struct ldb_module *module, const struct ldb_message *msg)
-{
- ldb_debug(module->ldb, LDB_DEBUG_TRACE, "objectguid_modify_record\n");
- return ldb_next_modify_record(module, msg);
-}
-
-static int objectguid_delete_record(struct ldb_module *module, const char *dn)
-{
- ldb_debug(module->ldb, LDB_DEBUG_TRACE, "objectguid_delete_record\n");
- return ldb_next_delete_record(module, dn);
-}
-
-static int objectguid_rename_record(struct ldb_module *module, const char *olddn, const char *newdn)
-{
- ldb_debug(module->ldb, LDB_DEBUG_TRACE, "objectguid_rename_record\n");
- return ldb_next_rename_record(module, olddn, newdn);
-}
-
-static int objectguid_lock(struct ldb_module *module, const char *lockname)
-{
- ldb_debug(module->ldb, LDB_DEBUG_TRACE, "objectguid_lock\n");
- return ldb_next_named_lock(module, lockname);
-}
-
-static int objectguid_unlock(struct ldb_module *module, const char *lockname)
-{
- ldb_debug(module->ldb, LDB_DEBUG_TRACE, "objectguid_unlock\n");
- return ldb_next_named_unlock(module, lockname);
-}
-
-/* return extended error information */
-static const char *objectguid_errstring(struct ldb_module *module)
-{
- struct private_data *data = (struct private_data *)module->private_data;
-
- ldb_debug(module->ldb, LDB_DEBUG_TRACE, "objectguid_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 objectguid_destructor(void *module_ctx)
-{
- /* struct ldb_module *ctx = module_ctx; */
- /* put your clean-up functions here */
- return 0;
-}
-
-static const struct ldb_module_ops objectguid_ops = {
- .name = "objectguid",
- .search = objectguid_search,
- .search_bytree = objectguid_search_bytree,
- .add_record = objectguid_add_record,
- .modify_record = objectguid_modify_record,
- .delete_record = objectguid_delete_record,
- .rename_record = objectguid_rename_record,
- .named_lock = objectguid_lock,
- .named_unlock = objectguid_unlock,
- .errstring = objectguid_errstring
-};
-
-
-/* the init function */
-#ifdef HAVE_DLOPEN_DISABLED
- struct ldb_module *init_module(struct ldb_context *ldb, const char *options[])
-#else
-struct ldb_module *objectguid_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 = &objectguid_ops;
-
- talloc_set_destructor (ctx, objectguid_destructor);
-
- return ctx;
-}
generated by cgit (git 2.34.1) at 2024-11-20 05:11:59 +0000