s4:dsdb/rootdse: Pass rootdse context to rootdse_add_dynamic

This replaced the *module parameter, and uses ac->module in the function
instead.
FIXME: should the req parameter be replaced by ac->req as well?

1 files changed, 8 insertions, 8 deletions

diff --git a/source4/dsdb/samdb/ldb_modules/rootdse.c b/source4/dsdb/samdb/ldb_modules/rootdse.c
index bdb5d92603..baffd1766c 100644
--- a/source4/dsdb/samdb/ldb_modules/rootdse.c
+++ b/source4/dsdb/samdb/ldb_modules/rootdse.c
@@ -218,11 +218,11 @@ static int dsdb_module_we_are_master(struct ldb_module *module, struct ldb_dn *d
 /*
   add dynamically generated attributes to rootDSE result
 */
-static int rootdse_add_dynamic(struct ldb_module *module, struct ldb_message *msg,
+static int rootdse_add_dynamic(struct rootdse_context *ac, struct ldb_message *msg,
 			       const char * const *attrs, struct ldb_request *req)
 {
 	struct ldb_context *ldb;
-	struct private_data *priv = talloc_get_type(ldb_module_get_private(module), struct private_data);
+	struct private_data *priv = talloc_get_type(ldb_module_get_private(ac->module), struct private_data);
 	char **server_sasl;
 	const struct dsdb_schema *schema;
 	int *val;
@@ -243,7 +243,7 @@ static int rootdse_add_dynamic(struct ldb_module *module, struct ldb_message *ms
 	};
 	unsigned int i;
 
-	ldb = ldb_module_get_ctx(module);
+	ldb = ldb_module_get_ctx(ac->module);
 	schema = dsdb_get_schema(ldb, NULL);
 
 	msg->dn = ldb_dn_new(msg, ldb, NULL);
@@ -264,7 +264,7 @@ static int rootdse_add_dynamic(struct ldb_module *module, struct ldb_message *ms
 		struct ldb_result *res;
 		int ret;
 		const char *dns_attrs[] = { "dNSHostName", NULL };
-		ret = dsdb_module_search_dn(module, msg, &res, samdb_server_dn(ldb, msg),
+		ret = dsdb_module_search_dn(ac->module, msg, &res, samdb_server_dn(ldb, msg),
 					    dns_attrs,
 					    DSDB_FLAG_NEXT_MODULE |
 					    DSDB_FLAG_AS_SYSTEM,
@@ -404,7 +404,7 @@ static int rootdse_add_dynamic(struct ldb_module *module, struct ldb_message *ms
 
 		for (i=0; i<3; i++) {
 			bool master;
-			int ret = dsdb_module_we_are_master(module, dns[i], &master, req);
+			int ret = dsdb_module_we_are_master(ac->module, dns[i], &master, req);
 			if (ret != LDB_SUCCESS) {
 				goto failed;
 			}
@@ -493,7 +493,7 @@ static int rootdse_add_dynamic(struct ldb_module *module, struct ldb_message *ms
 			continue;
 		}
 
-		ret = dsdb_module_search_dn(module, req, &res,
+		ret = dsdb_module_search_dn(ac->module, req, &res,
 					    attr_dn, no_attrs,
 					    DSDB_FLAG_NEXT_MODULE |
 					    DSDB_FLAG_AS_SYSTEM |
@@ -536,7 +536,7 @@ static int rootdse_add_dynamic(struct ldb_module *module, struct ldb_message *ms
 		int ret;
 		for (i=0; dn_attrs[i]; i++) {
 			if (!do_attribute(attrs, dn_attrs[i])) continue;
-			ret = expand_dn_in_message(module, msg, dn_attrs[i],
+			ret = expand_dn_in_message(ac->module, msg, dn_attrs[i],
 						   edn_control, req);
 			if (ret != LDB_SUCCESS) {
 				DEBUG(0,(__location__ ": Failed to expand DN in rootDSE for %s\n",
@@ -611,7 +611,7 @@ static int rootdse_callback(struct ldb_request *req, struct ldb_reply *ares)
 
 		/* for each record returned post-process to add any dynamic
 		   attributes that have been asked for */
-		ret = rootdse_add_dynamic(ac->module, ares->message,
+		ret = rootdse_add_dynamic(ac, ares->message,
 					  ac->req->op.search.attrs, ac->req);
 		if (ret != LDB_SUCCESS) {
 			talloc_free(ares);