r9685: Add tests for samba3sam mapping module

[sfrench/samba-autobuild/.git] / source4 / lib / ldb / common / ldb_modules.c

diff --git a/source4/lib/ldb/common/ldb_modules.c b/source4/lib/ldb/common/ldb_modules.c
index 644154d645952f269aba14b751a6a14b9fd2317c..20e8ad061ead1065a605fbc0a6edc2df0ec30835 100644 (file)
--- a/source4/lib/ldb/common/ldb_modules.c
+++ b/source4/lib/ldb/common/ldb_modules.c
@@ -139,8 +139,15 @@ int ldb_load_modules(struct ldb_context *ldb, const char *options[])
                int ret;
                const char * const attrs[] = { "@LIST" , NULL};
                struct ldb_message **msg = NULL;
+               struct ldb_dn *mods;
 
-               ret = ldb_search(ldb, "", LDB_SCOPE_BASE, "dn=@MODULES", attrs, &msg);
+               mods = ldb_dn_explode(ldb, "@MODULES");
+               if (mods == NULL) {
+                       return -1;
+               }
+
+               ret = ldb_search(ldb, mods, LDB_SCOPE_BASE, "", attrs, &msg);
+               talloc_free(mods);
                if (ret == 0 || (ret == 1 && msg[0]->num_elements == 0)) {
                        ldb_debug(ldb, LDB_DEBUG_TRACE, "no modules required by the db\n");
                } else {
@@ -189,7 +196,27 @@ 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], "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;
+                       }
+                       DLIST_ADD(ldb->modules, current);
+                       continue;
+               }
+
                if (strcmp(modules[i], "samldb") == 0) {
                        current = samldb_module_init(ldb, options);
                        if (!current) {
@@ -199,6 +226,17 @@ int ldb_load_modules(struct ldb_context *ldb, const char *options[])
                        DLIST_ADD(ldb->modules, current);
                        continue;
                }
+
+               if (strcmp(modules[i], "samba3sam") == 0) {
+                       current = ldb_samba3sam_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;
+               }
+
 #endif
 
                ldb_debug(ldb, LDB_DEBUG_WARNING, "WARNING: Module [%s] not found\n", modules[i]);
@@ -213,10 +251,10 @@ int ldb_load_modules(struct ldb_context *ldb, const char *options[])
 */
 
 int ldb_next_search(struct ldb_module *module, 
-              const char *base,
-              enum ldb_scope scope,
-              const char *expression,
-              const char * const *attrs, struct ldb_message ***res)
+                   const struct ldb_dn *base,
+                   enum ldb_scope scope,
+                   const char *expression,
+                   const char * const *attrs, struct ldb_message ***res)
 {
        if (!module->next) {
                return -1;
@@ -224,6 +262,18 @@ int ldb_next_search(struct ldb_module *module,
        return module->next->ops->search(module->next, base, scope, expression, attrs, res);
 }
 
+int ldb_next_search_bytree(struct ldb_module *module, 
+                          const struct ldb_dn *base,
+                          enum ldb_scope scope,
+                          struct ldb_parse_tree *tree,
+                          const char * const *attrs, struct ldb_message ***res)
+{
+       if (!module->next) {
+               return -1;
+       }
+       return module->next->ops->search_bytree(module->next, base, scope, tree, attrs, res);
+}
+
 int ldb_next_add_record(struct ldb_module *module, const struct ldb_message *message)
 {
        if (!module->next) {
@@ -240,7 +290,7 @@ int ldb_next_modify_record(struct ldb_module *module, const struct ldb_message *
        return module->next->ops->modify_record(module->next, message);
 }
 
-int ldb_next_delete_record(struct ldb_module *module, const char *dn)
+int ldb_next_delete_record(struct ldb_module *module, const struct ldb_dn *dn)
 {
        if (!module->next) {
                return -1;
@@ -248,7 +298,7 @@ int ldb_next_delete_record(struct ldb_module *module, const char *dn)
        return module->next->ops->delete_record(module->next, dn);
 }
 
-int ldb_next_rename_record(struct ldb_module *module, const char *olddn, const char *newdn)
+int ldb_next_rename_record(struct ldb_module *module, const struct ldb_dn *olddn, const struct ldb_dn *newdn)
 {
        if (!module->next) {
                return -1;