r11952: added a rootdse module. This will replace the existing rootdse code in

the ldap server. The reason for the change is that ldb modules need
some way to get at the static info stored in the rootDSE (such as the
location of the schema) but they can't do that right now

diff --git a/source/dsdb/config.mk b/source/dsdb/config.mk
index 6324f9d89e61c23621039cb28f6a190180a1b64b..92f3ee30f46f6fccf3038b9e993f89ac0270561f 100644 (file)
--- a/source/dsdb/config.mk
+++ b/source/dsdb/config.mk
@@ -1,45 +1,6 @@
 # Directory Service subsystem
 
-################################################
-# Start MODULE libldb_objectguid
-[MODULE::libldb_objectguid]
-SUBSYSTEM = LIBLDB
-INIT_OBJ_FILES = \
-               samdb/ldb_modules/objectguid.o
-REQUIRED_SUBSYSTEMS = \
-               LIBNDR NDR_MISC
-# End MODULE libldb_objectguid
-################################################
-
-################################################
-# Start MODULE libldb_samldb
-[MODULE::libldb_samldb]
-SUBSYSTEM = LIBLDB
-INIT_OBJ_FILES = \
-               samdb/ldb_modules/samldb.o
-#
-# End MODULE libldb_samldb
-################################################
-
-################################################
-# Start MODULE libldb_samba3sam
-[MODULE::libldb_samba3sam]
-SUBSYSTEM = LIBLDB
-INIT_OBJ_FILES = \
-               samdb/ldb_modules/samba3sam.o
-#
-# End MODULE libldb_samldb
-################################################
-
-################################################
-# Start MODULE libldb_proxy
-[MODULE::libldb_proxy]
-SUBSYSTEM = LIBLDB
-INIT_OBJ_FILES = \
-               samdb/ldb_modules/proxy.o
-#
-# End MODULE libldb_proxy
-################################################
+include samdb/ldb_modules/config.mk
 
 ################################################
 # Start SUBSYSTEM SAMDB

diff --git a/source/dsdb/samdb/ldb_modules/config.mk b/source/dsdb/samdb/ldb_modules/config.mk
new file mode 100644 (file)
index 0000000..48296dd
--- /dev/null
+++ b/source/dsdb/samdb/ldb_modules/config.mk
@@ -0,0 +1,52 @@
+################################################
+# Start MODULE libldb_objectguid
+[MODULE::libldb_objectguid]
+SUBSYSTEM = LIBLDB
+INIT_OBJ_FILES = \
+               objectguid.o
+REQUIRED_SUBSYSTEMS = \
+               LIBNDR NDR_MISC
+# End MODULE libldb_objectguid
+################################################
+
+################################################
+# Start MODULE libldb_samldb
+[MODULE::libldb_samldb]
+SUBSYSTEM = LIBLDB
+INIT_OBJ_FILES = \
+               samldb.o
+#
+# End MODULE libldb_samldb
+################################################
+
+################################################
+# Start MODULE libldb_samba3sam
+[MODULE::libldb_samba3sam]
+SUBSYSTEM = LIBLDB
+INIT_OBJ_FILES = \
+               samba3sam.o
+#
+# End MODULE libldb_samldb
+################################################
+
+################################################
+# Start MODULE libldb_proxy
+[MODULE::libldb_proxy]
+SUBSYSTEM = LIBLDB
+INIT_OBJ_FILES = \
+               proxy.o
+#
+# End MODULE libldb_proxy
+################################################
+
+
+################################################
+# Start MODULE libldb_rootdse
+[MODULE::libldb_rootdse]
+SUBSYSTEM = LIBLDB
+INIT_OBJ_FILES = \
+               rootdse.o
+#
+# End MODULE libldb_rootdse
+################################################
+

diff --git a/source/dsdb/samdb/ldb_modules/rootdse.c b/source/dsdb/samdb/ldb_modules/rootdse.c
new file mode 100644 (file)
index 0000000..b0a21ef
--- /dev/null
+++ b/source/dsdb/samdb/ldb_modules/rootdse.c
@@ -0,0 +1,149 @@
+/* 
+   Unix SMB/CIFS implementation.
+
+   rootDSE ldb module
+
+   Copyright (C) Andrew Tridgell 2005
+   
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
+   
+   This program 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 General Public License for more details.
+   
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
+
+#include "includes.h"
+#include "lib/ldb/include/ldb.h"
+#include "lib/ldb/include/ldb_errors.h"
+#include "lib/ldb/include/ldb_private.h"
+#include <time.h>
+
+/*
+  return 1 if a specific attribute has been requested
+*/
+static int do_attribute(const char * const *attrs, const char *name)
+{
+       return attrs == NULL ||
+               ldb_attr_in_list(attrs, name) ||
+               ldb_attr_in_list(attrs, "*");
+}
+
+/*
+  add dynamically generated attributes to rootDSE result
+*/
+static int rootdse_add_dynamic(struct ldb_module *module, struct ldb_request *req)
+{
+       struct ldb_search *s = &req->op.search;
+       struct ldb_message *msg;
+
+       /* this is gross, and will be removed when I change ldb_result not
+          to be so pointer crazy :-) */
+       if (s->res[0][0].msgs == NULL) {
+               return LDB_SUCCESS;
+       }
+
+       msg = s->res[0][0].msgs[0];
+
+       msg->dn = ldb_dn_explode(msg, "");
+
+       if (do_attribute(s->attrs, "currentTime")) {
+               if (ldb_msg_add_string(msg, "currentTime", 
+                                      ldb_timestring(msg, time(NULL))) != 0) {
+                       goto failed;
+               }
+       }
+
+       /* TODO: lots more dynamic attributes should be added here */
+
+       return 0;
+
+failed:
+       return LDB_ERR_OPERATIONS_ERROR;
+}
+
+/*
+  handle search requests
+*/
+static int rootdse_search_bytree(struct ldb_module *module, struct ldb_request *req)
+{
+//     struct ldb_request r = *req;
+       struct ldb_search *s = &req->op.search;
+       int ret;
+       TALLOC_CTX *tmp_ctx;
+
+       /* see if its for the rootDSE */
+       if (s->scope != LDB_SCOPE_BASE ||
+           (s->base && s->base->comp_num != 0)) {
+               return ldb_next_request(module, req);
+       }
+
+       tmp_ctx = talloc_new(module);
+
+       /* in our db we store the rootDSE with a DN of cn=rootDSE */
+       s->base = ldb_dn_explode(tmp_ctx, "cn=rootDSE");
+       s->tree = ldb_parse_tree(tmp_ctx, "dn=*");
+       if (s->base == NULL || s->tree == NULL) {
+               ldb_oom(module->ldb);
+               talloc_free(tmp_ctx);
+               return LDB_ERR_OPERATIONS_ERROR;
+       }
+
+       /* grab the static contents of the record */
+       ret = ldb_next_request(module, req);
+
+       req->op.search.res = s->res;
+
+       if (ret == LDB_SUCCESS) {
+               ret = rootdse_add_dynamic(module, req);
+       }
+
+       talloc_free(tmp_ctx);
+
+       return ret;
+}
+
+
+static int rootdse_request(struct ldb_module *module, struct ldb_request *req)
+{
+       switch (req->operation) {
+       case LDB_REQ_SEARCH:
+               return rootdse_search_bytree(module, req);
+       default:
+               break;
+       }
+       return ldb_next_request(module, req);
+}
+
+static const struct ldb_module_ops rootdse_ops = {
+       .name           = "rootdse",
+       .request        = rootdse_request
+};
+
+#ifdef HAVE_DLOPEN_DISABLED
+struct ldb_module *init_module(struct ldb_context *ldb, const char *options[])
+#else
+struct ldb_module *rootdse_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->ldb = ldb;
+       ctx->prev = ctx->next = NULL;
+       ctx->ops = &rootdse_ops;
+       ctx->private_data = NULL;
+
+       return ctx;
+}
+