svn commit: samba r18309 - in branches/SAMBA_4_0/source: lib/ldb/ldb_ildap libcli/ldap torture/ldap winbind

[tridge at samba.org]

Author: tridge
Date: 2006-09-09 12:57:45 +0000 (Sat, 09 Sep 2006)
New Revision: 18309

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=18309

Log:

FreeBSD 6.1 has a symbol ldap_new_connection() in the system ldap
library. Even though we don't like to that library, it gets loaded via
nss-ldap, which means nss-ldap calls into the samba ldap lib with the
wrong parameters, and crashes.

We really need to use a completely different namespace in libcli/ldap/

Modified:
   branches/SAMBA_4_0/source/lib/ldb/ldb_ildap/ldb_ildap.c
   branches/SAMBA_4_0/source/libcli/ldap/ldap_client.c
   branches/SAMBA_4_0/source/torture/ldap/common.c
   branches/SAMBA_4_0/source/winbind/wb_init_domain.c


Changeset:
Modified: branches/SAMBA_4_0/source/lib/ldb/ldb_ildap/ldb_ildap.c
===================================================================
--- branches/SAMBA_4_0/source/lib/ldb/ldb_ildap/ldb_ildap.c	2006-09-09 12:51:32 UTC (rev 18308)
+++ branches/SAMBA_4_0/source/lib/ldb/ldb_ildap/ldb_ildap.c	2006-09-09 12:57:45 UTC (rev 18309)
@@ -755,7 +755,7 @@
 
 	ildb->ldb     = ldb;
 
-	ildb->ldap = ldap_new_connection(ildb, ldb_get_opaque(ldb, "EventContext"));
+	ildb->ldap = ldap4_new_connection(ildb, ldb_get_opaque(ldb, "EventContext"));
 	if (!ildb->ldap) {
 		ldb_oom(ldb);
 		goto failed;

Modified: branches/SAMBA_4_0/source/libcli/ldap/ldap_client.c
===================================================================
--- branches/SAMBA_4_0/source/libcli/ldap/ldap_client.c	2006-09-09 12:51:32 UTC (rev 18308)
+++ branches/SAMBA_4_0/source/libcli/ldap/ldap_client.c	2006-09-09 12:57:45 UTC (rev 18309)
@@ -40,7 +40,7 @@
 /*
   create a new ldap_connection stucture. The event context is optional
 */
-struct ldap_connection *ldap_new_connection(TALLOC_CTX *mem_ctx, 
+struct ldap_connection *ldap4_new_connection(TALLOC_CTX *mem_ctx, 
 					    struct event_context *ev)
 {
 	struct ldap_connection *conn;

Modified: branches/SAMBA_4_0/source/torture/ldap/common.c
===================================================================
--- branches/SAMBA_4_0/source/torture/ldap/common.c	2006-09-09 12:51:32 UTC (rev 18308)
+++ branches/SAMBA_4_0/source/torture/ldap/common.c	2006-09-09 12:57:45 UTC (rev 18309)
@@ -64,7 +64,7 @@
 		return NT_STATUS_INVALID_PARAMETER;
 	}
 
-	*conn = ldap_new_connection(mem_ctx, NULL);
+	*conn = ldap4_new_connection(mem_ctx, NULL);
 
 	status = ldap_connect(*conn, url);
 	if (!NT_STATUS_IS_OK(status)) {

Modified: branches/SAMBA_4_0/source/winbind/wb_init_domain.c
===================================================================
--- branches/SAMBA_4_0/source/winbind/wb_init_domain.c	2006-09-09 12:51:32 UTC (rev 18308)
+++ branches/SAMBA_4_0/source/winbind/wb_init_domain.c	2006-09-09 12:57:45 UTC (rev 18309)
@@ -293,7 +293,7 @@
 	}
 
 	state->domain->ldap_conn =
-		ldap_new_connection(state->domain, state->ctx->event_ctx);
+		ldap4_new_connection(state->domain, state->ctx->event_ctx);
 	composite_nomem(state->domain->ldap_conn, state->ctx);
 
 	ldap_url = talloc_asprintf(state, "ldap://%s/",