git.samba.org / kamenim / samba.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
r7527: - added a ldb_search_bytree() interface, which takes a ldb_parse_tree
[kamenim/samba.git] / source4 / lib / ldb / modules / timestamps.c
diff --git a/source4/lib/ldb/modules/timestamps.c b/source4/lib/ldb/modules/timestamps.c
index 4066d231cde76f8efef31994551f64721e75221a..c1db85a2847a037ac6d4cbe188887b6768bed1d3 100644 (file)
--- a/source4/lib/ldb/modules/timestamps.c
+++ b/source4/lib/ldb/modules/timestamps.c
@@ -41,12 +41,6 @@ struct private_data {
        const char *error_string;
 };
 
-static int timestamps_close(struct ldb_module *module)
-{
-       ldb_debug(module->ldb, LDB_DEBUG_TRACE, "timestamps_close\n");
-       return ldb_next_close(module);
-}
-
 static int timestamps_search(struct ldb_module *module, const char *base,
                                  enum ldb_scope scope, const char *expression,
                                  const char * const *attrs, struct ldb_message ***res)
@@ -55,10 +49,12 @@ static int timestamps_search(struct ldb_module *module, const char *base,
        return ldb_next_search(module, base, scope, expression, attrs, res);
 }
 
-static int timestamps_search_free(struct ldb_module *module, struct ldb_message **res)
+static int timestamps_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, "timestamps_search_free\n");
-       return ldb_next_search_free(module, res);
+       ldb_debug(module->ldb, LDB_DEBUG_TRACE, "timestamps_search\n");
+       return ldb_next_search_bytree(module, base, scope, tree, attrs, res);
 }
 
 static int add_time_element(struct ldb_module *module, struct ldb_message *msg, 
@@ -69,7 +65,7 @@ static int add_time_element(struct ldb_module *module, struct ldb_message *msg,
        int i;
 
        for (i = 0; i < msg->num_elements; i++) {
-               if (strcasecmp(msg->elements[i].name, attr_name) == 0) {
+               if (ldb_attr_cmp(msg->elements[i].name, attr_name) == 0) {
                        return 0;
                }
        }
@@ -106,41 +102,43 @@ static int timestamps_add_record(struct ldb_module *module, const struct ldb_mes
 
        ldb_debug(module->ldb, LDB_DEBUG_TRACE, "timestamps_add_record\n");
 
-       if (msg->dn[0] != '@') { /* do not manipulate our control entries */
-               timeval = time(NULL);
-               tm = gmtime(&timeval);
-               if (!tm) {
-                       return -1;
-               }
+       if (msg->dn[0] == '@') { /* do not manipulate our control entries */
+               return ldb_next_add_record(module, msg);
+       }
 
-               msg2 = talloc(module, struct ldb_message);
-               if (!msg2) {
-                       return -1;
-               }
+       timeval = time(NULL);
+       tm = gmtime(&timeval);
+       if (!tm) {
+               return -1;
+       }
 
-               /* formatted like: 20040408072012.0Z */
-               timestr = talloc_asprintf(msg2, "%04u%02u%02u%02u%02u%02u.0Z",
-                                         tm->tm_year+1900, tm->tm_mon+1,
-                                         tm->tm_mday, tm->tm_hour, tm->tm_min,
-                                         tm->tm_sec);
-               if (!timestr) {
-                       return -1;
-               }
+       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];
-               }
+       /* formatted like: 20040408072012.0Z */
+       timestr = talloc_asprintf(msg2, "%04u%02u%02u%02u%02u%02u.0Z",
+                                 tm->tm_year+1900, tm->tm_mon+1,
+                                 tm->tm_mday, tm->tm_hour, tm->tm_min,
+                                 tm->tm_sec);
+       if (!timestr) {
+               return -1;
+       }
 
-               add_time_element(module, msg2, "createTimestamp", timestr, LDB_FLAG_MOD_ADD);
-               add_time_element(module, msg2, "modifyTimestamp", timestr, LDB_FLAG_MOD_ADD);
-               add_time_element(module, msg2, "whenCreated", timestr, LDB_FLAG_MOD_ADD);
-               add_time_element(module, msg2, "whenChanged", timestr, LDB_FLAG_MOD_ADD);
+       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];
        }
 
+       add_time_element(module, msg2, "createTimestamp", timestr, LDB_FLAG_MOD_ADD);
+       add_time_element(module, msg2, "modifyTimestamp", timestr, LDB_FLAG_MOD_ADD);
+       add_time_element(module, msg2, "whenCreated", timestr, LDB_FLAG_MOD_ADD);
+       add_time_element(module, msg2, "whenChanged", timestr, LDB_FLAG_MOD_ADD);
+
        if (msg2) {
                ret = ldb_next_add_record(module, msg2);
                talloc_free(msg2);
@@ -162,40 +160,42 @@ static int timestamps_modify_record(struct ldb_module *module, const struct ldb_
 
        ldb_debug(module->ldb, LDB_DEBUG_TRACE, "timestamps_modify_record\n");
 
-       if (msg->dn[0] != '@') { /* do not manipulate our control entries */
-               timeval = time(NULL);
-               tm = gmtime(&timeval);
-               if (!tm) {
-                       return -1;
-               }
+       if (msg->dn[0] == '@') { /* do not manipulate our control entries */
+               return ldb_next_modify_record(module, msg);
+       }
 
-               msg2 = talloc(module, struct ldb_message);
-               if (!msg2) {
-                       return -1;
-               }
+       timeval = time(NULL);
+       tm = gmtime(&timeval);
+       if (!tm) {
+               return -1;
+       }
 
-               /* formatted like: 20040408072012.0Z */
-               timestr = talloc_asprintf(msg2, 
-                                       "%04u%02u%02u%02u%02u%02u.0Z",
-                                       tm->tm_year+1900, tm->tm_mon+1,
-                                       tm->tm_mday, tm->tm_hour, tm->tm_min,
-                                       tm->tm_sec);
-               if (!timestr) {
-                       return -1;
-               }
+       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];
-               }
+       /* formatted like: 20040408072012.0Z */
+       timestr = talloc_asprintf(msg2, 
+                               "%04u%02u%02u%02u%02u%02u.0Z",
+                               tm->tm_year+1900, tm->tm_mon+1,
+                               tm->tm_mday, tm->tm_hour, tm->tm_min,
+                               tm->tm_sec);
+       if (!timestr) {
+               return -1;
+       }
 
-               add_time_element(module, msg2, "modifyTimestamp", timestr, LDB_FLAG_MOD_REPLACE);
-               add_time_element(module, msg2, "whenChanged", timestr, LDB_FLAG_MOD_REPLACE);
+       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];
        }
 
+       add_time_element(module, msg2, "modifyTimestamp", timestr, LDB_FLAG_MOD_REPLACE);
+       add_time_element(module, msg2, "whenChanged", timestr, LDB_FLAG_MOD_REPLACE);
+
        if (msg2) {
                ret = ldb_next_modify_record(module, msg2);
                talloc_free(msg2);
@@ -247,18 +247,24 @@ static const char *timestamps_errstring(struct ldb_module *module)
        return ldb_next_errstring(module);
 }
 
+static int timestamps_destructor(void *module_ctx)
+{
+       /* struct ldb_module *ctx = module_ctx; */
+       /* put your clean-up functions here */
+       return 0;
+}
+
 static const struct ldb_module_ops timestamps_ops = {
-       "timestamps",
-       timestamps_close, 
-       timestamps_search,
-       timestamps_search_free,
-       timestamps_add_record,
-       timestamps_modify_record,
-       timestamps_delete_record,
-       timestamps_rename_record,
-       timestamps_lock,
-       timestamps_unlock,
-       timestamps_errstring
+       .name          = "timestamps",
+       .search        = timestamps_search,
+       .search_bytree = timestamps_search_bytree,
+       .add_record    = timestamps_add_record,
+       .modify_record = timestamps_modify_record,
+       .delete_record = timestamps_delete_record,
+       .rename_record = timestamps_rename_record,
+       .named_lock    = timestamps_lock,
+       .named_unlock  = timestamps_unlock,
+       .errstring     = timestamps_errstring
 };
 
 
@@ -288,5 +294,7 @@ struct ldb_module *timestamps_module_init(struct ldb_context *ldb, const char *o
        ctx->prev = ctx->next = NULL;
        ctx->ops = &timestamps_ops;
 
+       talloc_set_destructor (ctx, timestamps_destructor);
+
        return ctx;
 }
kamenim's wip repo