From 598b565980a02a8909e3738c17fc503f83efe45e Mon Sep 17 00:00:00 2001 From: Matthias Dieter Wallnöfer Date: Wed, 3 Nov 2010 09:39:15 +0100 Subject: s4:objectguid LDB module - remove "objectguid_find_attribute" MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It's exactly the same as "ldb_msg_find_element". In addition remove a comment which points out a "fixme" for a semi-async call since we started to permit them again. Autobuild-User: Matthias Dieter Wallnöfer Autobuild-Date: Wed Nov 3 09:29:46 UTC 2010 on sn-devel-104 --- source4/dsdb/samdb/ldb_modules/objectguid.c | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) (limited to 'source4/dsdb/samdb') diff --git a/source4/dsdb/samdb/ldb_modules/objectguid.c b/source4/dsdb/samdb/ldb_modules/objectguid.c index b5d814ec28..28d253a0d1 100644 --- a/source4/dsdb/samdb/ldb_modules/objectguid.c +++ b/source4/dsdb/samdb/ldb_modules/objectguid.c @@ -35,19 +35,6 @@ #include "librpc/gen_ndr/ndr_misc.h" #include "param/param.h" -static struct ldb_message_element *objectguid_find_attribute(const struct ldb_message *msg, const char *name) -{ - unsigned 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 a time element to a record */ @@ -140,7 +127,6 @@ static int objectguid_add(struct ldb_module *module, struct ldb_request *req) { struct ldb_context *ldb; struct ldb_request *down_req; - struct ldb_message_element *attribute; struct ldb_message *msg; struct GUID guid; uint64_t seq_num; @@ -157,7 +143,7 @@ static int objectguid_add(struct ldb_module *module, struct ldb_request *req) return ldb_next_request(module, req); } - if ((attribute = objectguid_find_attribute(req->op.add.message, "objectGUID")) != NULL ) { + if (ldb_msg_find_element(req->op.add.message, "objectGUID") != NULL) { return ldb_next_request(module, req); } @@ -189,8 +175,6 @@ static int objectguid_add(struct ldb_module *module, struct ldb_request *req) } /* Get a sequence number from the backend */ - /* FIXME: ldb_sequence_number is a semi-async call, - * make sure this function is split and a callback is used */ ret = ldb_sequence_number(ldb, LDB_SEQ_NEXT, &seq_num); if (ret == LDB_SUCCESS) { if (add_uint64_element(ldb, msg, "uSNCreated", -- cgit