s4:dsdb/util: split out dsdb_module_obj_by_guid() from dsdb_module_dn_by_guid()

[samba.git] / source4 / dsdb / samdb / ldb_modules / util.c

diff --git a/source4/dsdb/samdb/ldb_modules/util.c b/source4/dsdb/samdb/ldb_modules/util.c
index c2949f0734dc046ea122ab27235632c78127cfef..69820983f88a136265b494ff0483ac163e4d61ad 100644 (file)
--- a/source4/dsdb/samdb/ldb_modules/util.c
+++ b/source4/dsdb/samdb/ldb_modules/util.c
@@ -255,14 +255,16 @@ int dsdb_module_search(struct ldb_module *module,
 }
 
 /*
-  find a DN given a GUID. This searches across all partitions
+  find an object given a GUID. This searches across all partitions
  */
-int dsdb_module_dn_by_guid(struct ldb_module *module, TALLOC_CTX *mem_ctx,
-                          const struct GUID *guid, struct ldb_dn **dn,
-                          struct ldb_request *parent)
+int dsdb_module_obj_by_guid(struct ldb_module *module,
+                           TALLOC_CTX *mem_ctx,
+                           struct ldb_message **_msg,
+                           const struct GUID *guid,
+                           const char * const *attrs,
+                           struct ldb_request *parent)
 {
        struct ldb_result *res;
-       const char *attrs[] = { NULL };
        TALLOC_CTX *tmp_ctx = talloc_new(mem_ctx);
        int ret;
 
@@ -289,7 +291,36 @@ int dsdb_module_dn_by_guid(struct ldb_module *module, TALLOC_CTX *mem_ctx,
                return LDB_ERR_OPERATIONS_ERROR;
        }
 
-       *dn = talloc_steal(mem_ctx, res->msgs[0]->dn);
+       *_msg = talloc_steal(mem_ctx, res->msgs[0]);
+
+       talloc_free(tmp_ctx);
+       return LDB_SUCCESS;
+}
+
+/*
+  find a DN given a GUID. This searches across all partitions
+ */
+int dsdb_module_dn_by_guid(struct ldb_module *module, TALLOC_CTX *mem_ctx,
+                          const struct GUID *guid, struct ldb_dn **dn,
+                          struct ldb_request *parent)
+{
+       struct ldb_message *msg = NULL;
+       const char *attrs[] = { NULL };
+       TALLOC_CTX *tmp_ctx = talloc_new(mem_ctx);
+       int ret;
+
+       ret = dsdb_module_obj_by_guid(module,
+                                     tmp_ctx,
+                                     &msg,
+                                     guid,
+                                     attrs,
+                                     parent);
+       if (ret != LDB_SUCCESS) {
+               talloc_free(tmp_ctx);
+               return ret;
+       }
+
+       *dn = talloc_steal(mem_ctx, msg->dn);
 
        talloc_free(tmp_ctx);
        return LDB_SUCCESS;