summaryrefslogtreecommitdiff
path: root/source4/lib/ldb/modules
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2005-10-12 08:51:12 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:39:43 -0500
commitc8978cb1f15b1ddc0c420baa568bd11db080b744 (patch)
tree7a04b650f52d1e6d143aa6bf4ed9f87e4670a9ef /source4/lib/ldb/modules
parentdc3e65b25295f68d0c7c5d3a7cc9bade638661f4 (diff)
downloadsamba-c8978cb1f15b1ddc0c420baa568bd11db080b744.tar.gz
samba-c8978cb1f15b1ddc0c420baa568bd11db080b744.tar.bz2
samba-c8978cb1f15b1ddc0c420baa568bd11db080b744.zip
r10918: - fixed standalone ldb build
- added note about allowedAttributesEffective (will be needed for mmc) - fixed some more ldb warnings (This used to be commit e9e4d81b6976549db8a7668572a5da466fbec4a9)
Diffstat (limited to 'source4/lib/ldb/modules')
-rw-r--r--source4/lib/ldb/modules/operational.c4
-rw-r--r--source4/lib/ldb/modules/timestamps.c222
2 files changed, 4 insertions, 222 deletions
diff --git a/source4/lib/ldb/modules/operational.c b/source4/lib/ldb/modules/operational.c
index 09f9a9e62c..c40936df07 100644
--- a/source4/lib/ldb/modules/operational.c
+++ b/source4/lib/ldb/modules/operational.c
@@ -61,6 +61,10 @@
for this one we do the search as normal, then if requested ask
for objectclass, change the attribute name, and add it
+ allowedAttributesEffective: HIDDEN, CONSTRUCTED, not-searchable,
+ list of attributes that can be modified - requires schema lookup
+
+
attributeTypes: in schema only
objectClasses: in schema only
matchingRules: in schema only
diff --git a/source4/lib/ldb/modules/timestamps.c b/source4/lib/ldb/modules/timestamps.c
deleted file mode 100644
index 8451da2445..0000000000
--- a/source4/lib/ldb/modules/timestamps.c
+++ /dev/null
@@ -1,222 +0,0 @@
-/*
- ldb database library
-
- Copyright (C) Simo Sorce 2004
-
- ** NOTE! The following LGPL license applies to the ldb
- ** library. This does NOT imply that all of Samba is released
- ** under the LGPL
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-*/
-
-/*
- * Name: ldb
- *
- * Component: ldb timestamps module
- *
- * Description: add object timestamping functionality
- *
- * Author: Simo Sorce
- */
-
-#include "includes.h"
-#include "ldb/include/ldb.h"
-#include "ldb/include/ldb_private.h"
-#include <time.h>
-
-static int timestamps_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)
-{
- 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,
- const char *attr_name, const char *time_string, unsigned int flags)
-{
- struct ldb_message_element *attribute = NULL;
-
- int i;
-
- for (i = 0; i < msg->num_elements; i++) {
- if (ldb_attr_cmp(msg->elements[i].name, attr_name) == 0) {
- return 0;
- }
- }
-
- if (ldb_msg_add_string(msg, attr_name, time_string) != 0) {
- return -1;
- }
-
- for (i = 0; i < msg->num_elements; i++) {
- if (ldb_attr_cmp(attr_name, msg->elements[i].name) == 0) {
- attribute = &msg->elements[i];
- break;
- }
- }
-
- if (!attribute) {
- return -1;
- }
-
- attribute->flags = flags;
-
- return 0;
-}
-
-/* add_record: add crateTimestamp/modifyTimestamp attributes */
-static int timestamps_add_record(struct ldb_module *module, const struct ldb_message *msg)
-{
- struct ldb_message *msg2 = NULL;
- struct tm *tm;
- char *timestr;
- time_t timeval;
- int ret, i;
-
- ldb_debug(module->ldb, LDB_DEBUG_TRACE, "timestamps_add_record\n");
-
- /* do not manipulate our control entries */
- if (ldb_dn_is_special(msg->dn)) {
- return ldb_next_add_record(module, msg);
- }
-
- timeval = time(NULL);
- tm = gmtime(&timeval);
- if (!tm) {
- return -1;
- }
-
- msg2 = talloc(module, struct ldb_message);
- if (!msg2) {
- 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->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);
- } else {
- ret = ldb_next_add_record(module, msg);
- }
-
- return ret;
-}
-
-/* modify_record: change modifyTimestamp as well */
-static int timestamps_modify_record(struct ldb_module *module, const struct ldb_message *msg)
-{
- struct ldb_message *msg2 = NULL;
- struct tm *tm;
- char *timestr;
- time_t timeval;
- int ret, i;
-
- ldb_debug(module->ldb, LDB_DEBUG_TRACE, "timestamps_modify_record\n");
-
- /* do not manipulate our control entries */
- if (ldb_dn_is_special(msg->dn)) {
- return ldb_next_modify_record(module, msg);
- }
-
- timeval = time(NULL);
- tm = gmtime(&timeval);
- if (!tm) {
- return -1;
- }
-
- msg2 = talloc(module, struct ldb_message);
- if (!msg2) {
- 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->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);
-
- ret = ldb_next_modify_record(module, msg2);
- talloc_free(msg2);
-
- return ret;
-}
-
-
-static const struct ldb_module_ops timestamps_ops = {
- .name = "timestamps",
- .search_bytree = timestamps_search_bytree,
- .add_record = timestamps_add_record,
- .modify_record = timestamps_modify_record
-};
-
-
-/* the init function */
-#ifdef HAVE_DLOPEN_DISABLED
- struct ldb_module *init_module(struct ldb_context *ldb, const char *options[])
-#else
-struct ldb_module *timestamps_module_init(struct ldb_context *ldb, const char *options[])
-#endif
-{
- struct ldb_module *ctx;
-
- ctx = talloc(ldb, struct ldb_module);
- if (!ctx)
- return NULL;
-
- ctx->private_data = NULL;
- ctx->ldb = ldb;
- ctx->prev = ctx->next = NULL;
- ctx->ops = &timestamps_ops;
-
- return ctx;
-}