From 860ffba4e147b7c27b416df60bec587eb61ea148 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Tue, 11 Oct 2005 12:31:31 +0000
Subject: r10897: added in a hackish ldb proxy module that I am using to
 experiment with mmc management support (This used to be commit
 99a5b088810e8e2f4e28b99a4a0e5e7dc9301594)

---
 source4/dsdb/samdb/ldb_modules/proxy.c | 340 +++++++++++++++++++++++++++++++++
 1 file changed, 340 insertions(+)
 create mode 100644 source4/dsdb/samdb/ldb_modules/proxy.c

(limited to 'source4/dsdb/samdb/ldb_modules/proxy.c')

diff --git a/source4/dsdb/samdb/ldb_modules/proxy.c b/source4/dsdb/samdb/ldb_modules/proxy.c
new file mode 100644
index 0000000000..4ef5e450aa
--- /dev/null
+++ b/source4/dsdb/samdb/ldb_modules/proxy.c
@@ -0,0 +1,340 @@
+/* 
+   samdb proxy module
+
+   Copyright (C) Andrew Tridgell 2005
+
+     ** 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
+*/
+
+/*
+  ldb proxy module. At startup this looks for a record like this:
+
+   dn=@PROXYINFO
+   url=destination url
+   olddn = basedn to proxy in upstream server
+   newdn = basedn in local server
+   username = username to connect to upstream
+   password = password for upstream
+
+   NOTE: this module is a complete hack at this stage. I am committing it just
+   so others can know how I am investigating mmc support
+   
+ */
+
+#include "includes.h"
+#include "ldb/include/ldb.h"
+#include "ldb/include/ldb_private.h"
+#include "lib/cmdline/popt_common.h"
+
+struct proxy_data {
+	struct ldb_context *upstream;
+	struct ldb_dn *olddn;
+	struct ldb_dn *newdn;
+	const char **oldstr;
+	const char **newstr;
+};
+
+
+/*
+  load the @PROXYINFO record
+*/
+static int load_proxy_info(struct ldb_module *module)
+{
+	struct proxy_data *proxy = talloc_get_type(module->private_data, struct proxy_data);
+	struct ldb_dn *dn;
+	struct ldb_message **msg;
+	int res;
+	const char *olddn, *newdn, *url, *username, *password, *oldstr, *newstr;
+	struct cli_credentials *creds;
+	
+
+	/* see if we have already loaded it */
+	if (proxy->upstream != NULL) {
+		return 0;
+	}
+
+	dn = ldb_dn_explode(proxy, "@PROXYINFO");
+	if (dn == NULL) {
+		goto failed;
+	}
+	res = ldb_search(module->ldb, dn, LDB_SCOPE_BASE, NULL, NULL, &msg);
+	talloc_free(dn);
+	if (res != 1) {
+		ldb_debug(module->ldb, LDB_DEBUG_FATAL, "Can't find @PROXYINFO\n");
+		goto failed;
+	}
+
+	url      = ldb_msg_find_string(msg[0], "url", NULL);
+	olddn    = ldb_msg_find_string(msg[0], "olddn", NULL);
+	newdn    = ldb_msg_find_string(msg[0], "newdn", NULL);
+	username = ldb_msg_find_string(msg[0], "username", NULL);
+	password = ldb_msg_find_string(msg[0], "password", NULL);
+	oldstr   = ldb_msg_find_string(msg[0], "oldstr", NULL);
+	newstr   = ldb_msg_find_string(msg[0], "newstr", NULL);
+
+	if (url == NULL || olddn == NULL || newdn == NULL || username == NULL || password == NULL) {
+		ldb_debug(module->ldb, LDB_DEBUG_FATAL, "Need url, olddn, newdn, oldstr, newstr, username and password in @PROXYINFO\n");
+		goto failed;
+	}
+
+	proxy->olddn = ldb_dn_explode(proxy, olddn);
+	if (proxy->olddn == NULL) {
+		ldb_debug(module->ldb, LDB_DEBUG_FATAL, "Failed to explode olddn '%s'\n", olddn);
+		goto failed;
+	}
+	
+	proxy->newdn = ldb_dn_explode(proxy, newdn);
+	if (proxy->newdn == NULL) {
+		ldb_debug(module->ldb, LDB_DEBUG_FATAL, "Failed to explode newdn '%s'\n", newdn);
+		goto failed;
+	}
+
+	proxy->upstream = ldb_init(proxy);
+	if (proxy->upstream == NULL) {
+		ldb_oom(module->ldb);
+		goto failed;
+	}
+
+	proxy->oldstr = str_list_make(proxy, oldstr, ", ");
+	if (proxy->oldstr == NULL) {
+		ldb_oom(module->ldb);
+		goto failed;
+	}
+
+	proxy->newstr = str_list_make(proxy, newstr, ", ");
+	if (proxy->newstr == NULL) {
+		ldb_oom(module->ldb);
+		goto failed;
+	}
+
+	/* setup credentials for connection */
+	creds = cli_credentials_init(proxy->upstream);
+	if (creds == NULL) {
+		ldb_oom(module->ldb);
+		goto failed;
+	}
+	cli_credentials_guess(creds);
+	cli_credentials_set_username(creds, username, CRED_SPECIFIED);
+	cli_credentials_set_password(creds, password, CRED_SPECIFIED);
+
+	ldb_set_opaque(proxy->upstream, "credentials", creds);
+
+	res = ldb_connect(proxy->upstream, url, 0, NULL);
+	if (res != 0) {
+		ldb_debug(module->ldb, LDB_DEBUG_FATAL, "proxy failed to connect to %s\n", url);
+		goto failed;
+	}
+
+	ldb_debug(module->ldb, LDB_DEBUG_TRACE, "proxy connected to %s\n", url);
+
+	talloc_free(msg);
+
+	return 0;
+
+failed:
+	talloc_free(msg);
+	talloc_free(proxy->olddn);
+	talloc_free(proxy->newdn);
+	talloc_free(proxy->upstream);
+	proxy->upstream = NULL;
+	return -1;
+}
+
+
+/*
+  convert a binary blob
+*/
+static void proxy_convert_blob(TALLOC_CTX *mem_ctx, struct ldb_val *v,
+			       const char *oldstr, const char *newstr)
+{
+	int len1, len2, len3;
+	uint8_t *olddata = v->data;
+	char *p = strcasestr((char *)v->data, oldstr);
+
+	len1 = (p - (char *)v->data);
+	len2 = strlen(newstr);
+	len3 = v->length - (p+strlen(oldstr) - (char *)v->data);
+	v->length = len1+len2+len3;
+	v->data = talloc_size(mem_ctx, v->length);
+	memcpy(v->data, olddata, len1);
+	memcpy(v->data+len1, newstr, len2);
+	memcpy(v->data+len1+len2, olddata + len1 + strlen(oldstr), len3);
+}
+
+/*
+  convert a returned value
+*/
+static void proxy_convert_value(struct ldb_module *module, struct ldb_message *msg, struct ldb_val *v)
+{
+	struct proxy_data *proxy = talloc_get_type(module->private_data, struct proxy_data);
+	int i;
+	for (i=0;proxy->oldstr[i];i++) {
+		char *p = strcasestr((char *)v->data, proxy->oldstr[i]);
+		if (p == NULL) continue;
+		proxy_convert_blob(msg, v, proxy->oldstr[i], proxy->newstr[i]);
+	}
+}
+
+
+/*
+  convert a returned value
+*/
+static struct ldb_parse_tree *proxy_convert_tree(struct ldb_module *module, 
+						 struct ldb_parse_tree *tree)
+{
+	struct proxy_data *proxy = talloc_get_type(module->private_data, struct proxy_data);
+	int i;
+	char *expression = ldb_filter_from_tree(module, tree);
+	for (i=0;proxy->newstr[i];i++) {
+		struct ldb_val v;
+		char *p = strcasestr(expression, proxy->newstr[i]);
+		if (p == NULL) continue;
+		v.data = (uint8_t *)expression;
+		v.length = strlen(expression)+1;
+		proxy_convert_blob(module, &v, proxy->newstr[i], proxy->oldstr[i]);
+		return ldb_parse_tree(module, (const char *)v.data);
+	}
+	return tree;
+}
+
+
+
+/*
+  convert a returned record
+*/
+static void proxy_convert_record(struct ldb_module *module, struct ldb_message *msg)
+{
+	struct proxy_data *proxy = talloc_get_type(module->private_data, struct proxy_data);
+	int attr, v;
+	
+	/* fix the message DN */
+	if (ldb_dn_compare_base(module->ldb, proxy->olddn, msg->dn) == 0) {
+		struct ldb_dn *newdn = ldb_dn_copy(msg, msg->dn);
+		newdn->comp_num -= proxy->olddn->comp_num;
+		msg->dn = ldb_dn_compose(msg, newdn, proxy->newdn);
+	}
+
+	/* fix any attributes */
+	for (attr=0;attr<msg->num_elements;attr++) {
+		for (v=0;v<msg->elements[attr].num_values;v++) {
+			proxy_convert_value(module, msg, &msg->elements[attr].values[v]);
+		}
+	}
+
+	/* fix any DN components */
+	for (attr=0;attr<msg->num_elements;attr++) {
+		for (v=0;v<msg->elements[attr].num_values;v++) {
+			proxy_convert_value(module, msg, &msg->elements[attr].values[v]);
+		}
+	}
+}
+
+/* search */
+static int proxy_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)
+{
+	struct proxy_data *proxy = talloc_get_type(module->private_data, struct proxy_data);
+	struct ldb_dn *newbase;
+	int ret, i;
+
+	if (base == NULL || (base->comp_num == 1 && base->components[0].name[0] == '@')) {
+		goto passthru;
+	}
+
+	if (load_proxy_info(module) != 0) {
+		return -1;
+	}
+
+	/* see if the dn is within olddn */
+	if (ldb_dn_compare_base(module->ldb, proxy->newdn, base) != 0) {
+		goto passthru;
+	}
+
+	tree = proxy_convert_tree(module, tree);
+
+	/* convert the basedn of this search */
+	newbase = ldb_dn_copy(proxy, base);
+	if (newbase == NULL) {
+		goto failed;
+	}
+	newbase->comp_num -= proxy->newdn->comp_num;
+	newbase = ldb_dn_compose(proxy, newbase, proxy->olddn);
+
+	ldb_debug(module->ldb, LDB_DEBUG_FATAL, "proxying: '%s' with dn '%s' \n", 
+		  ldb_filter_from_tree(proxy, tree), ldb_dn_linearize(proxy, newbase));
+	for (i=0;attrs && attrs[i];i++) {
+		ldb_debug(module->ldb, LDB_DEBUG_FATAL, "attr: '%s'\n", attrs[i]);
+	}
+	
+	ret = ldb_search_bytree(proxy->upstream, newbase, scope, tree, attrs, res);
+	if (ret == -1) {
+		ldb_set_errstring(module, talloc_strdup(module, ldb_errstring(proxy->upstream)));
+		return -1;
+	}
+
+	for (i=0;i<ret;i++) {
+		struct ldb_ldif ldif;
+		printf("# record %d\n", i+1);
+		
+		proxy_convert_record(module, (*res)[i]);
+
+		ldif.changetype = LDB_CHANGETYPE_NONE;
+		ldif.msg = (*res)[i];
+	}
+
+	return ret;
+
+failed:
+	ldb_debug(module->ldb, LDB_DEBUG_TRACE, "proxy failed for %s\n", 
+		  ldb_dn_linearize(proxy, base));
+
+passthru:
+	return ldb_next_search_bytree(module, base, scope, tree, attrs, res); 
+}
+
+
+static const struct ldb_module_ops proxy_ops = {
+	.name		   = "proxy",
+	.search_bytree     = proxy_search_bytree
+};
+
+#ifdef HAVE_DLOPEN_DISABLED
+struct ldb_module *init_module(struct ldb_context *ldb, const char *options[])
+#else
+struct ldb_module *proxy_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 = &proxy_ops;
+
+	ctx->private_data = talloc_zero(ctx, struct proxy_data);
+	if (ctx->private_data == NULL) {
+		return NULL;
+	}
+
+	return ctx;
+}
-- 
cgit 


From 5c9590587197dcb95007fdc54318187d5716c7c6 Mon Sep 17 00:00:00 2001
From: Simo Sorce <idra@samba.org>
Date: Tue, 8 Nov 2005 00:11:45 +0000
Subject: r11567: Ldb API change patch.

This patch changes the way lsb_search is called and the meaning of the returned integer.
The last argument of ldb_search is changed from struct ldb_message to struct ldb_result
which contains a pointer to a struct ldb_message list and a count of the number of messages.
The return is not the count of messages anymore but instead it is an ldb error value.

I tryed to keep the patch as tiny as possible bu as you can guess I had to change a good
amount of places. I also tried to double check all my changes being sure that the calling
functions would still behave as before. But this patch is big enough that I fear some bug
may have been introduced anyway even if it passes the test suite. So if you are currently
working on any file being touched please give it a deep look and blame me for any error.

Simo.
(This used to be commit 22c8c97e6fb466b41859e090e959d7f1134be780)
---
 source4/dsdb/samdb/ldb_modules/proxy.c | 96 ++++++++++++++++++++--------------
 1 file changed, 57 insertions(+), 39 deletions(-)

(limited to 'source4/dsdb/samdb/ldb_modules/proxy.c')

diff --git a/source4/dsdb/samdb/ldb_modules/proxy.c b/source4/dsdb/samdb/ldb_modules/proxy.c
index 4ef5e450aa..643ff5f3d0 100644
--- a/source4/dsdb/samdb/ldb_modules/proxy.c
+++ b/source4/dsdb/samdb/ldb_modules/proxy.c
@@ -39,6 +39,7 @@
 
 #include "includes.h"
 #include "ldb/include/ldb.h"
+#include "ldb/include/ldb_errors.h"
 #include "ldb/include/ldb_private.h"
 #include "lib/cmdline/popt_common.h"
 
@@ -58,8 +59,8 @@ static int load_proxy_info(struct ldb_module *module)
 {
 	struct proxy_data *proxy = talloc_get_type(module->private_data, struct proxy_data);
 	struct ldb_dn *dn;
-	struct ldb_message **msg;
-	int res;
+	struct ldb_result *res;
+	int ret;
 	const char *olddn, *newdn, *url, *username, *password, *oldstr, *newstr;
 	struct cli_credentials *creds;
 	
@@ -73,20 +74,20 @@ static int load_proxy_info(struct ldb_module *module)
 	if (dn == NULL) {
 		goto failed;
 	}
-	res = ldb_search(module->ldb, dn, LDB_SCOPE_BASE, NULL, NULL, &msg);
+	ret = ldb_search(module->ldb, dn, LDB_SCOPE_BASE, NULL, NULL, &res);
 	talloc_free(dn);
-	if (res != 1) {
+	if (ret != LDB_SUCCESS || res->count != 1) {
 		ldb_debug(module->ldb, LDB_DEBUG_FATAL, "Can't find @PROXYINFO\n");
 		goto failed;
 	}
 
-	url      = ldb_msg_find_string(msg[0], "url", NULL);
-	olddn    = ldb_msg_find_string(msg[0], "olddn", NULL);
-	newdn    = ldb_msg_find_string(msg[0], "newdn", NULL);
-	username = ldb_msg_find_string(msg[0], "username", NULL);
-	password = ldb_msg_find_string(msg[0], "password", NULL);
-	oldstr   = ldb_msg_find_string(msg[0], "oldstr", NULL);
-	newstr   = ldb_msg_find_string(msg[0], "newstr", NULL);
+	url      = ldb_msg_find_string(res->msgs[0], "url", NULL);
+	olddn    = ldb_msg_find_string(res->msgs[0], "olddn", NULL);
+	newdn    = ldb_msg_find_string(res->msgs[0], "newdn", NULL);
+	username = ldb_msg_find_string(res->msgs[0], "username", NULL);
+	password = ldb_msg_find_string(res->msgs[0], "password", NULL);
+	oldstr   = ldb_msg_find_string(res->msgs[0], "oldstr", NULL);
+	newstr   = ldb_msg_find_string(res->msgs[0], "newstr", NULL);
 
 	if (url == NULL || olddn == NULL || newdn == NULL || username == NULL || password == NULL) {
 		ldb_debug(module->ldb, LDB_DEBUG_FATAL, "Need url, olddn, newdn, oldstr, newstr, username and password in @PROXYINFO\n");
@@ -135,20 +136,20 @@ static int load_proxy_info(struct ldb_module *module)
 
 	ldb_set_opaque(proxy->upstream, "credentials", creds);
 
-	res = ldb_connect(proxy->upstream, url, 0, NULL);
-	if (res != 0) {
+	ret = ldb_connect(proxy->upstream, url, 0, NULL);
+	if (ret != 0) {
 		ldb_debug(module->ldb, LDB_DEBUG_FATAL, "proxy failed to connect to %s\n", url);
 		goto failed;
 	}
 
 	ldb_debug(module->ldb, LDB_DEBUG_TRACE, "proxy connected to %s\n", url);
 
-	talloc_free(msg);
+	talloc_free(res);
 
 	return 0;
 
 failed:
-	talloc_free(msg);
+	talloc_free(res);
 	talloc_free(proxy->olddn);
 	talloc_free(proxy->newdn);
 	talloc_free(proxy->upstream);
@@ -246,15 +247,16 @@ static void proxy_convert_record(struct ldb_module *module, struct ldb_message *
 }
 
 /* search */
-static int proxy_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)
+static int proxy_search_bytree(struct ldb_module *module, struct ldb_request *req)
 {
 	struct proxy_data *proxy = talloc_get_type(module->private_data, struct proxy_data);
-	struct ldb_dn *newbase;
+	struct ldb_request newreq;
+	struct ldb_dn *base;
 	int ret, i;
 
-	if (base == NULL || (base->comp_num == 1 && base->components[0].name[0] == '@')) {
+	if (req->op.search.base == NULL ||
+		(req->op.search.base->comp_num == 1 &&
+			req->op.search.base->components[0].name[0] == '@')) {
 		goto passthru;
 	}
 
@@ -263,56 +265,72 @@ static int proxy_search_bytree(struct ldb_module *module, const struct ldb_dn *b
 	}
 
 	/* see if the dn is within olddn */
-	if (ldb_dn_compare_base(module->ldb, proxy->newdn, base) != 0) {
+	if (ldb_dn_compare_base(module->ldb, proxy->newdn, req->op.search.base) != 0) {
 		goto passthru;
 	}
 
-	tree = proxy_convert_tree(module, tree);
+	newreq.op.search.tree = proxy_convert_tree(module, req->op.search.tree);
 
 	/* convert the basedn of this search */
-	newbase = ldb_dn_copy(proxy, base);
-	if (newbase == NULL) {
+	base = ldb_dn_copy(proxy, req->op.search.base);
+	if (base == NULL) {
 		goto failed;
 	}
-	newbase->comp_num -= proxy->newdn->comp_num;
-	newbase = ldb_dn_compose(proxy, newbase, proxy->olddn);
+	base->comp_num -= proxy->newdn->comp_num;
+	base = ldb_dn_compose(proxy, newreq.op.search.base, proxy->olddn);
 
 	ldb_debug(module->ldb, LDB_DEBUG_FATAL, "proxying: '%s' with dn '%s' \n", 
-		  ldb_filter_from_tree(proxy, tree), ldb_dn_linearize(proxy, newbase));
-	for (i=0;attrs && attrs[i];i++) {
-		ldb_debug(module->ldb, LDB_DEBUG_FATAL, "attr: '%s'\n", attrs[i]);
+		  ldb_filter_from_tree(proxy, newreq.op.search.tree), ldb_dn_linearize(proxy, newreq.op.search.base));
+	for (i = 0; req->op.search.attrs && req->op.search.attrs[i]; i++) {
+		ldb_debug(module->ldb, LDB_DEBUG_FATAL, "attr: '%s'\n", req->op.search.attrs[i]);
 	}
-	
-	ret = ldb_search_bytree(proxy->upstream, newbase, scope, tree, attrs, res);
-	if (ret == -1) {
+
+	newreq.op.search.base = base;
+	newreq.op.search.scope = req->op.search.scope;
+	newreq.op.search.attrs = req->op.search.attrs;
+	newreq.op.search.res = req->op.search.res;
+	ret = ldb_request(proxy->upstream, &newreq);
+	if (ret != LDB_SUCCESS) {
 		ldb_set_errstring(module, talloc_strdup(module, ldb_errstring(proxy->upstream)));
 		return -1;
 	}
 
-	for (i=0;i<ret;i++) {
+	for (i = 0; i < (*newreq.op.search.res)->count; i++) {
 		struct ldb_ldif ldif;
 		printf("# record %d\n", i+1);
 		
-		proxy_convert_record(module, (*res)[i]);
+		proxy_convert_record(module, (*newreq.op.search.res)->msgs[i]);
 
 		ldif.changetype = LDB_CHANGETYPE_NONE;
-		ldif.msg = (*res)[i];
+		ldif.msg = (*newreq.op.search.res)->msgs[i];
 	}
 
 	return ret;
 
 failed:
 	ldb_debug(module->ldb, LDB_DEBUG_TRACE, "proxy failed for %s\n", 
-		  ldb_dn_linearize(proxy, base));
+		  ldb_dn_linearize(proxy, req->op.search.base));
 
 passthru:
-	return ldb_next_search_bytree(module, base, scope, tree, attrs, res); 
+	return ldb_next_request(module, req); 
 }
 
+static int proxy_request(struct ldb_module *module, struct ldb_request *req)
+{
+	switch (req->operation) {
+
+	case LDB_REQ_SEARCH:
+		return proxy_search_bytree(module, req);
+
+	default:
+		return ldb_next_request(module, req);
+
+	}
+}
 
 static const struct ldb_module_ops proxy_ops = {
-	.name		   = "proxy",
-	.search_bytree     = proxy_search_bytree
+	.name		= "proxy",
+	.request	= proxy_request
 };
 
 #ifdef HAVE_DLOPEN_DISABLED
-- 
cgit 


From 6eabad9c9d977c1c5c6ecf7494a0be42ad113d23 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Tue, 29 Nov 2005 12:34:03 +0000
Subject: r11958: - fixed memory leaks in the ldb_result handling in ldb
 operations

- removed an unnecessary level of pointer in ldb_search structure
(This used to be commit b8d4afb14a18dfd8bac79882a035e74d3ed312bd)
---
 source4/dsdb/samdb/ldb_modules/proxy.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'source4/dsdb/samdb/ldb_modules/proxy.c')

diff --git a/source4/dsdb/samdb/ldb_modules/proxy.c b/source4/dsdb/samdb/ldb_modules/proxy.c
index 643ff5f3d0..a567db689d 100644
--- a/source4/dsdb/samdb/ldb_modules/proxy.c
+++ b/source4/dsdb/samdb/ldb_modules/proxy.c
@@ -295,14 +295,14 @@ static int proxy_search_bytree(struct ldb_module *module, struct ldb_request *re
 		return -1;
 	}
 
-	for (i = 0; i < (*newreq.op.search.res)->count; i++) {
+	for (i = 0; i < newreq.op.search.res->count; i++) {
 		struct ldb_ldif ldif;
 		printf("# record %d\n", i+1);
 		
-		proxy_convert_record(module, (*newreq.op.search.res)->msgs[i]);
+		proxy_convert_record(module, newreq.op.search.res->msgs[i]);
 
 		ldif.changetype = LDB_CHANGETYPE_NONE;
-		ldif.msg = (*newreq.op.search.res)->msgs[i];
+		ldif.msg = newreq.op.search.res->msgs[i];
 	}
 
 	return ret;
-- 
cgit 


From d4de4c2d210d2e8c9b5aedf70695594809ad6a0b Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Fri, 30 Dec 2005 13:16:54 +0000
Subject: r12608: Remove some unused #include lines. (This used to be commit
 70e7449318aa0e9d2639c76730a7d1683b2f4981)

---
 source4/dsdb/samdb/ldb_modules/proxy.c | 1 -
 1 file changed, 1 deletion(-)

(limited to 'source4/dsdb/samdb/ldb_modules/proxy.c')

diff --git a/source4/dsdb/samdb/ldb_modules/proxy.c b/source4/dsdb/samdb/ldb_modules/proxy.c
index a567db689d..fc1b896be4 100644
--- a/source4/dsdb/samdb/ldb_modules/proxy.c
+++ b/source4/dsdb/samdb/ldb_modules/proxy.c
@@ -41,7 +41,6 @@
 #include "ldb/include/ldb.h"
 #include "ldb/include/ldb_errors.h"
 #include "ldb/include/ldb_private.h"
-#include "lib/cmdline/popt_common.h"
 
 struct proxy_data {
 	struct ldb_context *upstream;
-- 
cgit 


From 3b99d9c5bd563203adc4b017d6e6599dd84b8d57 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Sun, 1 Jan 2006 17:32:10 +0000
Subject: r12658: Couple of fixes related to shared module builds. (This used
 to be commit c297c93faf3b748de68679f5a4be50845ebe25fe)

---
 source4/dsdb/samdb/ldb_modules/proxy.c | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'source4/dsdb/samdb/ldb_modules/proxy.c')

diff --git a/source4/dsdb/samdb/ldb_modules/proxy.c b/source4/dsdb/samdb/ldb_modules/proxy.c
index fc1b896be4..cbe404fc4b 100644
--- a/source4/dsdb/samdb/ldb_modules/proxy.c
+++ b/source4/dsdb/samdb/ldb_modules/proxy.c
@@ -332,11 +332,7 @@ static const struct ldb_module_ops proxy_ops = {
 	.request	= proxy_request
 };
 
-#ifdef HAVE_DLOPEN_DISABLED
-struct ldb_module *init_module(struct ldb_context *ldb, const char *options[])
-#else
 struct ldb_module *proxy_module_init(struct ldb_context *ldb, const char *options[])
-#endif
 {
 	struct ldb_module *ctx;
 
-- 
cgit 


From c908d0b2aa111659e57a73efb8c33c413965c846 Mon Sep 17 00:00:00 2001
From: Simo Sorce <idra@samba.org>
Date: Fri, 6 Jan 2006 04:01:23 +0000
Subject: r12733: Merge ldap/ldb controls into main tree There's still lot of
 work to do but the patch is stable enough to be pushed into the main samba4
 tree.

Simo.
(This used to be commit 77125feaff252cab44d26593093a9c211c846ce8)
---
 source4/dsdb/samdb/ldb_modules/proxy.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'source4/dsdb/samdb/ldb_modules/proxy.c')

diff --git a/source4/dsdb/samdb/ldb_modules/proxy.c b/source4/dsdb/samdb/ldb_modules/proxy.c
index cbe404fc4b..540f4241b9 100644
--- a/source4/dsdb/samdb/ldb_modules/proxy.c
+++ b/source4/dsdb/samdb/ldb_modules/proxy.c
@@ -288,6 +288,7 @@ static int proxy_search_bytree(struct ldb_module *module, struct ldb_request *re
 	newreq.op.search.scope = req->op.search.scope;
 	newreq.op.search.attrs = req->op.search.attrs;
 	newreq.op.search.res = req->op.search.res;
+	newreq.controls = req->controls;
 	ret = ldb_request(proxy->upstream, &newreq);
 	if (ret != LDB_SUCCESS) {
 		ldb_set_errstring(module, talloc_strdup(module, ldb_errstring(proxy->upstream)));
@@ -332,10 +333,12 @@ static const struct ldb_module_ops proxy_ops = {
 	.request	= proxy_request
 };
 
-struct ldb_module *proxy_module_init(struct ldb_context *ldb, const char *options[])
+struct ldb_module *proxy_module_init(struct ldb_context *ldb, int stage, const char *options[])
 {
 	struct ldb_module *ctx;
 
+	if (stage != LDB_MODULES_INIT_STAGE_1) return NULL;
+
 	ctx = talloc(ldb, struct ldb_module);
 	if (!ctx)
 		return NULL;
-- 
cgit 


From dbef4d76de92c3388f4e1819a76d6febf90be290 Mon Sep 17 00:00:00 2001
From: Simo Sorce <idra@samba.org>
Date: Fri, 6 Jan 2006 16:12:45 +0000
Subject: r12743: Remove the ugly way we had to make a second stage init and
 introduce a second_stage_init private function for modules that need a second
 stage init.

Simo.
(This used to be commit 5e8b365fa2d93801a5de1d9ea76ce9d5546bd248)
---
 source4/dsdb/samdb/ldb_modules/proxy.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'source4/dsdb/samdb/ldb_modules/proxy.c')

diff --git a/source4/dsdb/samdb/ldb_modules/proxy.c b/source4/dsdb/samdb/ldb_modules/proxy.c
index 540f4241b9..2c66d2c1ec 100644
--- a/source4/dsdb/samdb/ldb_modules/proxy.c
+++ b/source4/dsdb/samdb/ldb_modules/proxy.c
@@ -333,12 +333,10 @@ static const struct ldb_module_ops proxy_ops = {
 	.request	= proxy_request
 };
 
-struct ldb_module *proxy_module_init(struct ldb_context *ldb, int stage, const char *options[])
+struct ldb_module *proxy_module_init(struct ldb_context *ldb, const char *options[])
 {
 	struct ldb_module *ctx;
 
-	if (stage != LDB_MODULES_INIT_STAGE_1) return NULL;
-
 	ctx = talloc(ldb, struct ldb_module);
 	if (!ctx)
 		return NULL;
-- 
cgit 


From d590dea10b3abf93fcc8138189291e8b66bae7d7 Mon Sep 17 00:00:00 2001
From: Simo Sorce <idra@samba.org>
Date: Wed, 22 Feb 2006 05:21:43 +0000
Subject: r13615: Make ldb_set_errstring get ldb instead of module as
 parameter. The module was just used to get to the ldb so it was meningless.

Also add LDB_WAIT_ONCE e relative code in ldb_ildap.c
(This used to be commit d5b467b7c132b0bd4d23918ba7bf3370b1afcce8)
---
 source4/dsdb/samdb/ldb_modules/proxy.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source4/dsdb/samdb/ldb_modules/proxy.c')

diff --git a/source4/dsdb/samdb/ldb_modules/proxy.c b/source4/dsdb/samdb/ldb_modules/proxy.c
index 2c66d2c1ec..511f9aeec5 100644
--- a/source4/dsdb/samdb/ldb_modules/proxy.c
+++ b/source4/dsdb/samdb/ldb_modules/proxy.c
@@ -291,7 +291,7 @@ static int proxy_search_bytree(struct ldb_module *module, struct ldb_request *re
 	newreq.controls = req->controls;
 	ret = ldb_request(proxy->upstream, &newreq);
 	if (ret != LDB_SUCCESS) {
-		ldb_set_errstring(module, talloc_strdup(module, ldb_errstring(proxy->upstream)));
+		ldb_set_errstring(module->ldb, talloc_strdup(module, ldb_errstring(proxy->upstream)));
 		return -1;
 	}
 
-- 
cgit 


From 26af14c39b88b0e7eb53657b89be65d865804688 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Thu, 2 Mar 2006 16:32:53 +0000
Subject: r13786: [merge] Add registration functions for LDB modules

Applications that use LDB modules will now have to run ldb_global_init()
before they can use LDB.

The next step will be adding support for loading LDB modules from .so
files. This will also allow us to use one LDB without difference between the
standalone and the Samba-specific build
(This used to be commit 52a235650514039bf8ffee99a784bbc1b6ae6b92)
---
 source4/dsdb/samdb/ldb_modules/proxy.c | 19 ++-----------------
 1 file changed, 2 insertions(+), 17 deletions(-)

(limited to 'source4/dsdb/samdb/ldb_modules/proxy.c')

diff --git a/source4/dsdb/samdb/ldb_modules/proxy.c b/source4/dsdb/samdb/ldb_modules/proxy.c
index 511f9aeec5..85b40b62d1 100644
--- a/source4/dsdb/samdb/ldb_modules/proxy.c
+++ b/source4/dsdb/samdb/ldb_modules/proxy.c
@@ -333,22 +333,7 @@ static const struct ldb_module_ops proxy_ops = {
 	.request	= proxy_request
 };
 
-struct ldb_module *proxy_module_init(struct ldb_context *ldb, const char *options[])
+int proxy_module_init(void)
 {
-	struct ldb_module *ctx;
-
-	ctx = talloc(ldb, struct ldb_module);
-	if (!ctx)
-		return NULL;
-
-	ctx->ldb = ldb;
-	ctx->prev = ctx->next = NULL;
-	ctx->ops = &proxy_ops;
-
-	ctx->private_data = talloc_zero(ctx, struct proxy_data);
-	if (ctx->private_data == NULL) {
-		return NULL;
-	}
-
-	return ctx;
+	return ldb_register_module(&proxy_ops);
 }
-- 
cgit 


From 82da2d401e54d0b3124b727fab755d94dd5402d4 Mon Sep 17 00:00:00 2001
From: Simo Sorce <idra@samba.org>
Date: Wed, 8 Mar 2006 01:01:14 +0000
Subject: r13998: From now on ldb_request() will require an alloced request By
 freeing the request you will be sure everything down the path get freed.

this also means you have to steal the results if you want to keep them :)

simo.
(This used to be commit e8075e6a062ce5edb84485e45d0b841c2ee2af7d)
---
 source4/dsdb/samdb/ldb_modules/proxy.c | 36 +++++++++++++++++++---------------
 1 file changed, 20 insertions(+), 16 deletions(-)

(limited to 'source4/dsdb/samdb/ldb_modules/proxy.c')

diff --git a/source4/dsdb/samdb/ldb_modules/proxy.c b/source4/dsdb/samdb/ldb_modules/proxy.c
index 85b40b62d1..9f9a8c229e 100644
--- a/source4/dsdb/samdb/ldb_modules/proxy.c
+++ b/source4/dsdb/samdb/ldb_modules/proxy.c
@@ -249,7 +249,7 @@ static void proxy_convert_record(struct ldb_module *module, struct ldb_message *
 static int proxy_search_bytree(struct ldb_module *module, struct ldb_request *req)
 {
 	struct proxy_data *proxy = talloc_get_type(module->private_data, struct proxy_data);
-	struct ldb_request newreq;
+	struct ldb_request *newreq;
 	struct ldb_dn *base;
 	int ret, i;
 
@@ -268,43 +268,47 @@ static int proxy_search_bytree(struct ldb_module *module, struct ldb_request *re
 		goto passthru;
 	}
 
-	newreq.op.search.tree = proxy_convert_tree(module, req->op.search.tree);
+	newreq = talloc(module, struct ldb_request);
+	if (newreq == NULL) {
+		return -1;
+	}
+
+	newreq->op.search.tree = proxy_convert_tree(module, req->op.search.tree);
 
 	/* convert the basedn of this search */
 	base = ldb_dn_copy(proxy, req->op.search.base);
 	if (base == NULL) {
+		talloc_free(newreq);
 		goto failed;
 	}
 	base->comp_num -= proxy->newdn->comp_num;
-	base = ldb_dn_compose(proxy, newreq.op.search.base, proxy->olddn);
+	base = ldb_dn_compose(proxy, newreq->op.search.base, proxy->olddn);
 
 	ldb_debug(module->ldb, LDB_DEBUG_FATAL, "proxying: '%s' with dn '%s' \n", 
-		  ldb_filter_from_tree(proxy, newreq.op.search.tree), ldb_dn_linearize(proxy, newreq.op.search.base));
+		  ldb_filter_from_tree(proxy, newreq->op.search.tree), ldb_dn_linearize(proxy, newreq->op.search.base));
 	for (i = 0; req->op.search.attrs && req->op.search.attrs[i]; i++) {
 		ldb_debug(module->ldb, LDB_DEBUG_FATAL, "attr: '%s'\n", req->op.search.attrs[i]);
 	}
 
-	newreq.op.search.base = base;
-	newreq.op.search.scope = req->op.search.scope;
-	newreq.op.search.attrs = req->op.search.attrs;
-	newreq.op.search.res = req->op.search.res;
-	newreq.controls = req->controls;
-	ret = ldb_request(proxy->upstream, &newreq);
+	newreq->op.search.base = base;
+	newreq->op.search.scope = req->op.search.scope;
+	newreq->op.search.attrs = req->op.search.attrs;
+	newreq->op.search.res = req->op.search.res;
+	newreq->controls = req->controls;
+	ret = ldb_request(proxy->upstream, newreq);
 	if (ret != LDB_SUCCESS) {
 		ldb_set_errstring(module->ldb, talloc_strdup(module, ldb_errstring(proxy->upstream)));
+		talloc_free(newreq);
 		return -1;
 	}
 
-	for (i = 0; i < newreq.op.search.res->count; i++) {
-		struct ldb_ldif ldif;
+	for (i = 0; i < newreq->op.search.res->count; i++) {
 		printf("# record %d\n", i+1);
 		
-		proxy_convert_record(module, newreq.op.search.res->msgs[i]);
-
-		ldif.changetype = LDB_CHANGETYPE_NONE;
-		ldif.msg = newreq.op.search.res->msgs[i];
+		proxy_convert_record(module, newreq->op.search.res->msgs[i]);
 	}
 
+	talloc_free(newreq);
 	return ret;
 
 failed:
-- 
cgit 


From 3f16241a1d3243447d0244ebac05b447aec94df8 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Tue, 14 Mar 2006 01:29:56 +0000
Subject: r14363: Remove credentials.h from the global includes. (This used to
 be commit 98c4c3051391c6f89df5d133665f51bef66b1563)

---
 source4/dsdb/samdb/ldb_modules/proxy.c | 1 +
 1 file changed, 1 insertion(+)

(limited to 'source4/dsdb/samdb/ldb_modules/proxy.c')

diff --git a/source4/dsdb/samdb/ldb_modules/proxy.c b/source4/dsdb/samdb/ldb_modules/proxy.c
index 9f9a8c229e..e666de1414 100644
--- a/source4/dsdb/samdb/ldb_modules/proxy.c
+++ b/source4/dsdb/samdb/ldb_modules/proxy.c
@@ -41,6 +41,7 @@
 #include "ldb/include/ldb.h"
 #include "ldb/include/ldb_errors.h"
 #include "ldb/include/ldb_private.h"
+#include "auth/credentials/credentials.h"
 
 struct proxy_data {
 	struct ldb_context *upstream;
-- 
cgit 


From a088c2297d68385eb2869e73aaefd440606c5b4f Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Wed, 15 Mar 2006 05:48:39 +0000
Subject: r14426: ensure res is initialised (This used to be commit
 ce1326157c7e139a43ab31d4d1e366b78b69e26f)

---
 source4/dsdb/samdb/ldb_modules/proxy.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source4/dsdb/samdb/ldb_modules/proxy.c')

diff --git a/source4/dsdb/samdb/ldb_modules/proxy.c b/source4/dsdb/samdb/ldb_modules/proxy.c
index e666de1414..6a7d04d331 100644
--- a/source4/dsdb/samdb/ldb_modules/proxy.c
+++ b/source4/dsdb/samdb/ldb_modules/proxy.c
@@ -59,7 +59,7 @@ static int load_proxy_info(struct ldb_module *module)
 {
 	struct proxy_data *proxy = talloc_get_type(module->private_data, struct proxy_data);
 	struct ldb_dn *dn;
-	struct ldb_result *res;
+	struct ldb_result *res = NULL;
 	int ret;
 	const char *olddn, *newdn, *url, *username, *password, *oldstr, *newstr;
 	struct cli_credentials *creds;
-- 
cgit 


From faed8175063b16df94d5332581baf1af0562bb09 Mon Sep 17 00:00:00 2001
From: Simo Sorce <idra@samba.org>
Date: Sun, 13 Aug 2006 07:33:57 +0000
Subject: r17514: Simplify the way to set ldb errors and add another helper
 function to set them. (This used to be commit
 260868bae56194fcb98d55afc22fc66d96a303df)

---
 source4/dsdb/samdb/ldb_modules/proxy.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source4/dsdb/samdb/ldb_modules/proxy.c')

diff --git a/source4/dsdb/samdb/ldb_modules/proxy.c b/source4/dsdb/samdb/ldb_modules/proxy.c
index 6a7d04d331..c8e5a91e58 100644
--- a/source4/dsdb/samdb/ldb_modules/proxy.c
+++ b/source4/dsdb/samdb/ldb_modules/proxy.c
@@ -298,7 +298,7 @@ static int proxy_search_bytree(struct ldb_module *module, struct ldb_request *re
 	newreq->controls = req->controls;
 	ret = ldb_request(proxy->upstream, newreq);
 	if (ret != LDB_SUCCESS) {
-		ldb_set_errstring(module->ldb, talloc_strdup(module, ldb_errstring(proxy->upstream)));
+		ldb_set_errstring(module->ldb, ldb_errstring(proxy->upstream));
 		talloc_free(newreq);
 		return -1;
 	}
-- 
cgit 


From a23b63a8e54db7d0ec98ad95cdca11dd4d039e17 Mon Sep 17 00:00:00 2001
From: Simo Sorce <idra@samba.org>
Date: Sun, 13 Aug 2006 08:00:36 +0000
Subject: r17516: Change helper function names to make more clear what they are
 meant to do (This used to be commit ad75cf869550af66119d0293503024d41d834e02)

---
 source4/dsdb/samdb/ldb_modules/proxy.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'source4/dsdb/samdb/ldb_modules/proxy.c')

diff --git a/source4/dsdb/samdb/ldb_modules/proxy.c b/source4/dsdb/samdb/ldb_modules/proxy.c
index c8e5a91e58..d2628f5d1d 100644
--- a/source4/dsdb/samdb/ldb_modules/proxy.c
+++ b/source4/dsdb/samdb/ldb_modules/proxy.c
@@ -81,13 +81,13 @@ static int load_proxy_info(struct ldb_module *module)
 		goto failed;
 	}
 
-	url      = ldb_msg_find_string(res->msgs[0], "url", NULL);
-	olddn    = ldb_msg_find_string(res->msgs[0], "olddn", NULL);
-	newdn    = ldb_msg_find_string(res->msgs[0], "newdn", NULL);
-	username = ldb_msg_find_string(res->msgs[0], "username", NULL);
-	password = ldb_msg_find_string(res->msgs[0], "password", NULL);
-	oldstr   = ldb_msg_find_string(res->msgs[0], "oldstr", NULL);
-	newstr   = ldb_msg_find_string(res->msgs[0], "newstr", NULL);
+	url      = ldb_msg_find_attr_as_string(res->msgs[0], "url", NULL);
+	olddn    = ldb_msg_find_attr_as_string(res->msgs[0], "olddn", NULL);
+	newdn    = ldb_msg_find_attr_as_string(res->msgs[0], "newdn", NULL);
+	username = ldb_msg_find_attr_as_string(res->msgs[0], "username", NULL);
+	password = ldb_msg_find_attr_as_string(res->msgs[0], "password", NULL);
+	oldstr   = ldb_msg_find_attr_as_string(res->msgs[0], "oldstr", NULL);
+	newstr   = ldb_msg_find_attr_as_string(res->msgs[0], "newstr", NULL);
 
 	if (url == NULL || olddn == NULL || newdn == NULL || username == NULL || password == NULL) {
 		ldb_debug(module->ldb, LDB_DEBUG_FATAL, "Need url, olddn, newdn, oldstr, newstr, username and password in @PROXYINFO\n");
-- 
cgit 


From 4889eb9f7aae9349e426d0f6d2217adff67eaebd Mon Sep 17 00:00:00 2001
From: Simo Sorce <idra@samba.org>
Date: Wed, 22 Nov 2006 00:59:34 +0000
Subject: r19831: Big ldb_dn optimization and interfaces enhancement patch

This patch changes a lot of the code in ldb_dn.c, and also
removes and add a number of manipulation functions around.

The aim is to avoid validating a dn if not necessary as the
validation code is necessarily slow. This is mainly to speed up
internal operations where input is not user generated and so we
can assume the DNs need no validation. The code is designed to
keep the data as a string if possible.

The code is not yet 100% perfect, but pass all the tests so far.
A memleak is certainly present, I'll work on that next.

Simo.
(This used to be commit a580c871d3784602a9cce32d33419e63c8236e63)
---
 source4/dsdb/samdb/ldb_modules/proxy.c | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

(limited to 'source4/dsdb/samdb/ldb_modules/proxy.c')

diff --git a/source4/dsdb/samdb/ldb_modules/proxy.c b/source4/dsdb/samdb/ldb_modules/proxy.c
index d2628f5d1d..41fe8b68c9 100644
--- a/source4/dsdb/samdb/ldb_modules/proxy.c
+++ b/source4/dsdb/samdb/ldb_modules/proxy.c
@@ -70,7 +70,7 @@ static int load_proxy_info(struct ldb_module *module)
 		return 0;
 	}
 
-	dn = ldb_dn_explode(proxy, "@PROXYINFO");
+	dn = ldb_dn_new(proxy, module->ldb, "@PROXYINFO");
 	if (dn == NULL) {
 		goto failed;
 	}
@@ -94,13 +94,13 @@ static int load_proxy_info(struct ldb_module *module)
 		goto failed;
 	}
 
-	proxy->olddn = ldb_dn_explode(proxy, olddn);
+	proxy->olddn = ldb_dn_new(proxy, module->ldb, olddn);
 	if (proxy->olddn == NULL) {
 		ldb_debug(module->ldb, LDB_DEBUG_FATAL, "Failed to explode olddn '%s'\n", olddn);
 		goto failed;
 	}
 	
-	proxy->newdn = ldb_dn_explode(proxy, newdn);
+	proxy->newdn = ldb_dn_new(proxy, module->ldb, newdn);
 	if (proxy->newdn == NULL) {
 		ldb_debug(module->ldb, LDB_DEBUG_FATAL, "Failed to explode newdn '%s'\n", newdn);
 		goto failed;
@@ -226,9 +226,8 @@ static void proxy_convert_record(struct ldb_module *module, struct ldb_message *
 	
 	/* fix the message DN */
 	if (ldb_dn_compare_base(module->ldb, proxy->olddn, msg->dn) == 0) {
-		struct ldb_dn *newdn = ldb_dn_copy(msg, msg->dn);
-		newdn->comp_num -= proxy->olddn->comp_num;
-		msg->dn = ldb_dn_compose(msg, newdn, proxy->newdn);
+		ldb_dn_remove_base_components(msg->dn, ldb_dn_get_comp_num(proxy->olddn));
+		ldb_dn_add_base(msg->dn, proxy->newdn);
 	}
 
 	/* fix any attributes */
@@ -282,8 +281,8 @@ static int proxy_search_bytree(struct ldb_module *module, struct ldb_request *re
 		talloc_free(newreq);
 		goto failed;
 	}
-	base->comp_num -= proxy->newdn->comp_num;
-	base = ldb_dn_compose(proxy, newreq->op.search.base, proxy->olddn);
+	ldb_dn_remove_base_components(base, ldb_dn_get_comp_num(proxy->newdn));
+	ldb_dn_add_base(base, proxy->olddn);
 
 	ldb_debug(module->ldb, LDB_DEBUG_FATAL, "proxying: '%s' with dn '%s' \n", 
 		  ldb_filter_from_tree(proxy, newreq->op.search.tree), ldb_dn_linearize(proxy, newreq->op.search.base));
-- 
cgit 


From a9e31b33b55a873c2f01db5e348560176adf863d Mon Sep 17 00:00:00 2001
From: Simo Sorce <idra@samba.org>
Date: Wed, 22 Nov 2006 02:05:19 +0000
Subject: r19832: better prototypes for the linearization functions:

- ldb_dn_get_linearized
  returns a const string

- ldb_dn_alloc_linearized
  allocs astring with the linearized dn
(This used to be commit 3929c086d5d0b3f08b1c4f2f3f9602c3f4a9a4bd)
---
 source4/dsdb/samdb/ldb_modules/proxy.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'source4/dsdb/samdb/ldb_modules/proxy.c')

diff --git a/source4/dsdb/samdb/ldb_modules/proxy.c b/source4/dsdb/samdb/ldb_modules/proxy.c
index 41fe8b68c9..0dd5ee1e3d 100644
--- a/source4/dsdb/samdb/ldb_modules/proxy.c
+++ b/source4/dsdb/samdb/ldb_modules/proxy.c
@@ -285,7 +285,7 @@ static int proxy_search_bytree(struct ldb_module *module, struct ldb_request *re
 	ldb_dn_add_base(base, proxy->olddn);
 
 	ldb_debug(module->ldb, LDB_DEBUG_FATAL, "proxying: '%s' with dn '%s' \n", 
-		  ldb_filter_from_tree(proxy, newreq->op.search.tree), ldb_dn_linearize(proxy, newreq->op.search.base));
+		  ldb_filter_from_tree(proxy, newreq->op.search.tree), ldb_dn_get_linearized(newreq->op.search.base));
 	for (i = 0; req->op.search.attrs && req->op.search.attrs[i]; i++) {
 		ldb_debug(module->ldb, LDB_DEBUG_FATAL, "attr: '%s'\n", req->op.search.attrs[i]);
 	}
@@ -313,7 +313,7 @@ static int proxy_search_bytree(struct ldb_module *module, struct ldb_request *re
 
 failed:
 	ldb_debug(module->ldb, LDB_DEBUG_TRACE, "proxy failed for %s\n", 
-		  ldb_dn_linearize(proxy, req->op.search.base));
+		  ldb_dn_get_linearized(req->op.search.base));
 
 passthru:
 	return ldb_next_request(module, req); 
-- 
cgit 


From b8d69a7ea2505b706ff7c74d7c97bc89d82dfa07 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Tue, 10 Jul 2007 02:46:15 +0000
Subject: r23795: more v2->v3 conversion (This used to be commit
 84b468b2f8f2dffda89593f816e8bc6a8b6d42ac)

---
 source4/dsdb/samdb/ldb_modules/proxy.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source4/dsdb/samdb/ldb_modules/proxy.c')

diff --git a/source4/dsdb/samdb/ldb_modules/proxy.c b/source4/dsdb/samdb/ldb_modules/proxy.c
index 0dd5ee1e3d..e145068cfe 100644
--- a/source4/dsdb/samdb/ldb_modules/proxy.c
+++ b/source4/dsdb/samdb/ldb_modules/proxy.c
@@ -10,7 +10,7 @@
    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.
+   version 3 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
-- 
cgit 


From 6c973f4e8ccbcb6c9275f8a54e26abb19df7e15a Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Tue, 10 Jul 2007 03:42:26 +0000
Subject: r23798: updated old Temple Place FSF addresses to new URL (This used
 to be commit 40c0919aaa9c1b14bbaebb95ecce53eb0380fdbb)

---
 source4/dsdb/samdb/ldb_modules/proxy.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'source4/dsdb/samdb/ldb_modules/proxy.c')

diff --git a/source4/dsdb/samdb/ldb_modules/proxy.c b/source4/dsdb/samdb/ldb_modules/proxy.c
index e145068cfe..d50d971e2a 100644
--- a/source4/dsdb/samdb/ldb_modules/proxy.c
+++ b/source4/dsdb/samdb/ldb_modules/proxy.c
@@ -18,8 +18,7 @@
    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
+   License along with this library; if not, see <http://www.gnu.org/licenses/>.
 */
 
 /*
-- 
cgit 


From 5b357ca8774d97e85153151552bc052cfaf26c1b Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Mon, 3 Dec 2007 23:33:09 +0100
Subject: r26270: Require specifying the loadparm_context or NULL to
 cli_credentials_guess(). (This used to be commit
 e52710d6794a25ba697f8c26b43784226964f9cb)

---
 source4/dsdb/samdb/ldb_modules/proxy.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source4/dsdb/samdb/ldb_modules/proxy.c')

diff --git a/source4/dsdb/samdb/ldb_modules/proxy.c b/source4/dsdb/samdb/ldb_modules/proxy.c
index d50d971e2a..435422ae17 100644
--- a/source4/dsdb/samdb/ldb_modules/proxy.c
+++ b/source4/dsdb/samdb/ldb_modules/proxy.c
@@ -129,7 +129,7 @@ static int load_proxy_info(struct ldb_module *module)
 		ldb_oom(module->ldb);
 		goto failed;
 	}
-	cli_credentials_guess(creds);
+	cli_credentials_guess(creds, NULL);
 	cli_credentials_set_username(creds, username, CRED_SPECIFIED);
 	cli_credentials_set_password(creds, password, CRED_SPECIFIED);
 
-- 
cgit 


From da0f222f432c4fc8bf5da80baf849ca32b315ca0 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Mon, 3 Dec 2007 23:33:16 +0100
Subject: r26271: Remove some more uses of global_loadparm. (This used to be
 commit e9875fcd56de0748ed78d7e3c9cdb4919cd96d3c)

---
 source4/dsdb/samdb/ldb_modules/proxy.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source4/dsdb/samdb/ldb_modules/proxy.c')

diff --git a/source4/dsdb/samdb/ldb_modules/proxy.c b/source4/dsdb/samdb/ldb_modules/proxy.c
index 435422ae17..5f22982b8d 100644
--- a/source4/dsdb/samdb/ldb_modules/proxy.c
+++ b/source4/dsdb/samdb/ldb_modules/proxy.c
@@ -129,7 +129,7 @@ static int load_proxy_info(struct ldb_module *module)
 		ldb_oom(module->ldb);
 		goto failed;
 	}
-	cli_credentials_guess(creds, NULL);
+	cli_credentials_guess(creds, global_loadparm);
 	cli_credentials_set_username(creds, username, CRED_SPECIFIED);
 	cli_credentials_set_password(creds, password, CRED_SPECIFIED);
 
-- 
cgit 


From bca631be1f4cefeec3d64cd552ec6d9ee9cc1971 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Fri, 7 Dec 2007 03:01:41 +0100
Subject: r26329: Fix more loadparm_context references. Only about a 100 left
 now. (This used to be commit ddf233346d848e91bc6a6a572f0f6120540503b7)

---
 source4/dsdb/samdb/ldb_modules/proxy.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source4/dsdb/samdb/ldb_modules/proxy.c')

diff --git a/source4/dsdb/samdb/ldb_modules/proxy.c b/source4/dsdb/samdb/ldb_modules/proxy.c
index 5f22982b8d..37ee7f9fce 100644
--- a/source4/dsdb/samdb/ldb_modules/proxy.c
+++ b/source4/dsdb/samdb/ldb_modules/proxy.c
@@ -129,7 +129,7 @@ static int load_proxy_info(struct ldb_module *module)
 		ldb_oom(module->ldb);
 		goto failed;
 	}
-	cli_credentials_guess(creds, global_loadparm);
+	cli_credentials_guess(creds, ldb_get_opaque(module->ldb, "loadparm"));
 	cli_credentials_set_username(creds, username, CRED_SPECIFIED);
 	cli_credentials_set_password(creds, password, CRED_SPECIFIED);
 
-- 
cgit 


From 16109a40c0abd8c30a5eb9bf9ef692bfae9dfc7d Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Wed, 20 Feb 2008 01:54:32 +0100
Subject: Use struct-based rather than function-based initialization for ldb
 modules everywhere. (This used to be commit
 85c96a325867f7bcdb412ebc53f8a47dbf7cd89b)

---
 source4/dsdb/samdb/ldb_modules/proxy.c | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

(limited to 'source4/dsdb/samdb/ldb_modules/proxy.c')

diff --git a/source4/dsdb/samdb/ldb_modules/proxy.c b/source4/dsdb/samdb/ldb_modules/proxy.c
index 37ee7f9fce..a7704ef413 100644
--- a/source4/dsdb/samdb/ldb_modules/proxy.c
+++ b/source4/dsdb/samdb/ldb_modules/proxy.c
@@ -331,12 +331,7 @@ static int proxy_request(struct ldb_module *module, struct ldb_request *req)
 	}
 }
 
-static const struct ldb_module_ops proxy_ops = {
+const struct ldb_module_ops ldb_proxy_module_ops = {
 	.name		= "proxy",
 	.request	= proxy_request
 };
-
-int proxy_module_init(void)
-{
-	return ldb_register_module(&proxy_ops);
-}
-- 
cgit 


From 39a817d310964f8e9a63cfb096b3ad24fa03bd5e Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Wed, 20 Feb 2008 04:33:43 +0100
Subject: Fix use of some modules (needed _PUBLIC_). (This used to be commit
 ce332130ea77159832da23bab760fa26921719e2)

---
 source4/dsdb/samdb/ldb_modules/proxy.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source4/dsdb/samdb/ldb_modules/proxy.c')

diff --git a/source4/dsdb/samdb/ldb_modules/proxy.c b/source4/dsdb/samdb/ldb_modules/proxy.c
index a7704ef413..0d065425ca 100644
--- a/source4/dsdb/samdb/ldb_modules/proxy.c
+++ b/source4/dsdb/samdb/ldb_modules/proxy.c
@@ -331,7 +331,7 @@ static int proxy_request(struct ldb_module *module, struct ldb_request *req)
 	}
 }
 
-const struct ldb_module_ops ldb_proxy_module_ops = {
+_PUBLIC_ const struct ldb_module_ops ldb_proxy_module_ops = {
 	.name		= "proxy",
 	.request	= proxy_request
 };
-- 
cgit