summaryrefslogtreecommitdiff
path: root/source4/torture
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2006-09-09 12:57:45 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 14:18:06 -0500
commite91cee468eceb6ff8843bafc7fbb22a21b52a00c (patch)
treee187b289e0f4405465e742c940349c802013673d /source4/torture
parent66c16b5143041a504afdc6a9041e4928e7cd9ba2 (diff)
downloadsamba-e91cee468eceb6ff8843bafc7fbb22a21b52a00c.tar.gz
samba-e91cee468eceb6ff8843bafc7fbb22a21b52a00c.tar.bz2
samba-e91cee468eceb6ff8843bafc7fbb22a21b52a00c.zip
r18309: 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/ (This used to be commit c440e0eed9afae5fe69995a7416971e7c8560779)
Diffstat (limited to 'source4/torture')
-rw-r--r--source4/torture/ldap/common.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/source4/torture/ldap/common.c b/source4/torture/ldap/common.c
index c08534715a..5dc482776a 100644
--- a/source4/torture/ldap/common.c
+++ b/source4/torture/ldap/common.c
@@ -64,7 +64,7 @@ NTSTATUS torture_ldap_connection(TALLOC_CTX *mem_ctx, struct ldap_connection **c
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)) {