sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-27 03:21:53 +03:00
Code

r158: cope with or without LDAP in samba build of ldb

Browse Source
This commit is contained in:
Andrew Tridgell 2004-04-11 01:26:53 +00:00 committed by Gerald (Jerry) Carter
parent 5004159bf9
commit e776ce4f9e
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source/lib/ldb/common/ldb.c
View File

@ -52,11 +52,11 @@ struct ldb_context *ldb_connect(const char *url, unsigned int flags,
return ltdb_connect(url, flags, options);
}
#ifdef HAVE_LDAP
#if HAVE_LDAP
if (strncmp(url, "ldap", 4) == 0) {
return lldb_connect(url, flags, options);
}
#endif /*HAVE_LDAP*/
#endif
errno = EINVAL;
return NULL;

6
source/lib/ldb/config.m4
View File

@ -1,3 +1,7 @@
if test x"$HAVE_LDAP" = x"yes"; then
SMB_SUBSYSTEM(LIBLDB_LDAP,[lib/ldb/ldb_ldap/ldb_ldap.o])
fi
SMB_SUBSYSTEM(LIBLDB,[lib/ldb/common/ldb.o],
[lib/ldb/common/ldb_ldif.o \
lib/ldb/common/ldb_parse.o \
@ -8,7 +12,7 @@ SMB_SUBSYSTEM(LIBLDB,[lib/ldb/common/ldb.o],
lib/ldb/ldb_tdb/ldb_pack.o \
lib/ldb/ldb_tdb/ldb_index.o \
lib/ldb/ldb_tdb/ldb_match.o \
lib/ldb/ldb_ldap/ldb_ldap.o],
\$(LIBLDAP_LDAP_OBJS)],
lib/ldb/include/ldb.h)
SMB_SUBSYSTEM(LDBADD,[],