diff options
author | Andrew Tridgell <tridge@samba.org> | 2006-09-09 12:57:45 +0000 |
---|---|---|
committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 14:18:06 -0500 |
commit | e91cee468eceb6ff8843bafc7fbb22a21b52a00c (patch) | |
tree | e187b289e0f4405465e742c940349c802013673d /source4/lib | |
parent | 66c16b5143041a504afdc6a9041e4928e7cd9ba2 (diff) | |
download | samba-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/lib')
-rw-r--r-- | source4/lib/ldb/ldb_ildap/ldb_ildap.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source4/lib/ldb/ldb_ildap/ldb_ildap.c b/source4/lib/ldb/ldb_ildap/ldb_ildap.c index b22dd517d2..f521425312 100644 --- a/source4/lib/ldb/ldb_ildap/ldb_ildap.c +++ b/source4/lib/ldb/ldb_ildap/ldb_ildap.c @@ -755,7 +755,7 @@ static int ildb_connect(struct ldb_context *ldb, const char *url, 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; |