svn commit: samba r12717 - in branches/SAMBA_4_0/source/lib/ldb: . modules

[abartlet at samba.org]

Author: abartlet
Date: 2006-01-05 04:56:19 +0000 (Thu, 05 Jan 2006)
New Revision: 12717

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=12717

Log:
Always compile the skel module, so we know when we break it.

Also fix up all the current issues with the skel module.

Andrew Bartlett

Modified:
   branches/SAMBA_4_0/source/lib/ldb/config.mk
   branches/SAMBA_4_0/source/lib/ldb/modules/skel.c


Changeset:
Modified: branches/SAMBA_4_0/source/lib/ldb/config.mk
===================================================================
--- branches/SAMBA_4_0/source/lib/ldb/config.mk	2006-01-05 02:14:01 UTC (rev 12716)
+++ branches/SAMBA_4_0/source/lib/ldb/config.mk	2006-01-05 04:56:19 UTC (rev 12717)
@@ -61,6 +61,15 @@
 ################################################
 
 ################################################
+# Start MODULE libldb_skel
+[MODULE::libldb_skel]
+SUBSYSTEM = LIBLDB
+OUTPUT_TYPE = MERGEDOBJ
+OBJ_FILES = modules/skel.o
+# End MODULE libldb_skel
+################################################
+
+################################################
 # Start MODULE libldb_sqlite3
 [MODULE::libldb_sqlite3]
 SUBSYSTEM = LIBLDB

Modified: branches/SAMBA_4_0/source/lib/ldb/modules/skel.c
===================================================================
--- branches/SAMBA_4_0/source/lib/ldb/modules/skel.c	2006-01-05 02:14:01 UTC (rev 12716)
+++ branches/SAMBA_4_0/source/lib/ldb/modules/skel.c	2006-01-05 04:56:19 UTC (rev 12717)
@@ -42,35 +42,32 @@
 };
 
 /* search */
-static int skel_search(struct ldb_module *module, const struct ldb_dn *base,
-		       enum ldb_scope scope, struct ldb_parse_tree *tree,
-		       const char * const *attrs, struct ldb_result **res)
+static int skel_search(struct ldb_module *module, struct ldb_request *req)
 {
-	return ldb_next_search(module, base, scope, tree, attrs, res); 
+	return ldb_next_request(module, req);
 }
 
-/* add_record */
-static int skel_add_record(struct ldb_module *module, const struct ldb_message *msg)
-{
-	return ldb_next_add_record(module, msg);
+/* add */
+static int skel_add(struct ldb_module *module, struct ldb_request *req){
+	return ldb_next_request(module, req);
 }
 
-/* modify_record */
-static int skel_modify_record(struct ldb_module *module, const struct ldb_message *msg)
+/* modify */
+static int skel_modify(struct ldb_module *module, struct ldb_request *req)
 {
-	return ldb_next_modify_record(module, msg);
+	return ldb_next_request(module, req);
 }
 
-/* delete_record */
-static int skel_delete_record(struct ldb_module *module, const struct ldb_dn *dn)
+/* delete */
+static int skel_delete(struct ldb_module *module, struct ldb_request *req)
 {
-	return ldb_next_delete_record(module, dn);
+	return ldb_next_request(module, req);
 }
 
-/* rename_record */
-static int skel_rename_record(struct ldb_module *module, const struct ldb_dn *olddn, const struct ldb_dn *newdn)
+/* rename */
+static int skel_rename(struct ldb_module *module, struct ldb_request *req)
 {
-	return ldb_next_rename_record(module, olddn, newdn);
+	return ldb_next_request(module, req);
 }
 
 /* start a transaction */
@@ -105,26 +102,20 @@
 	switch (req->operation) {
 
 	case LDB_REQ_SEARCH:
-		return skel_search_bytree(module,
-					  req->op.search->base,
-					  req->op.search->scope, 
-					  req->op.search->tree, 
-					  req->op.search->attrs, 
-					  req->op.search->res);
+		return skel_search(module, req);
 
 	case LDB_REQ_ADD:
-		return skel_add(module, req->op.add->message);
+		return skel_add(module, req);
 
 	case LDB_REQ_MODIFY:
-		return skel_modify(module, req->op.mod->message);
+		return skel_modify(module, req);
 
 	case LDB_REQ_DELETE:
-		return skel_delete(module, req->op.del->dn);
+		return skel_delete(module, req);
 
 	case LDB_REQ_RENAME:
 		return skel_rename(module,
-					req->op.rename->olddn,
-					req->op.rename->newdn);
+				   req);
 
 	default:
 		return ldb_next_request(module, req);