summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGerald Carter <jerry@samba.org>2003-06-03 19:25:39 +0000
committerGerald Carter <jerry@samba.org>2003-06-03 19:25:39 +0000
commit10c241d2a083901df8141cc8f266c118e4c2a8d0 (patch)
tree7622b028f92ae0118531c1d707a892d512946541
parent5dae5bb045db03e89bc4fd471836654201f5d64f (diff)
downloadsamba-10c241d2a083901df8141cc8f266c118e4c2a8d0.tar.gz
samba-10c241d2a083901df8141cc8f266c118e4c2a8d0.tar.bz2
samba-10c241d2a083901df8141cc8f266c118e4c2a8d0.zip
added idmap_ldap to wrong branch.
(This used to be commit eafd53a7e7b54ccf2089dc5841ea4291a891ea91)
-rw-r--r--source3/configure.in7
-rw-r--r--source3/sam/idmap_ldap.c1
2 files changed, 4 insertions, 4 deletions
diff --git a/source3/configure.in b/source3/configure.in
index d0e7f44078..79f01ba421 100644
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -2318,7 +2318,7 @@ LIBS=""
AC_CHECK_LIB(ldap, ldap_domain2hostlist, [
AC_DEFINE(HAVE_LDAP,1,[Whether ldap is available])
AC_CHECK_HEADERS([ldap.h lber.h],
- [default_static_modules="$default_static_modules pdb_ldap"])
+ [default_static_modules="$default_static_modules pdb_ldap idmap_ldap"])
])
])
@@ -3776,8 +3776,9 @@ SMB_MODULE(rpc_samr, \$(RPC_SAMR_OBJ), "bin/librpc_samr.$SHLIBEXT", RPC)
SMB_MODULE(rpc_echo, \$(RPC_ECHO_OBJ), "bin/librpc_echo.$SHLIBEXT", RPC)
SMB_SUBSYSTEM(RPC)
-SMB_MODULE(idmap_winbind, sam/idmap_winbind.o, "bin/winbind_idmap.$SHLIBEXT", IDMAP)
-SMB_MODULE(idmap_tdb, sam/idmap_tdb.o, "bin/winbind_tdb.$SHLIBEXT", IDMAP)
+SMB_MODULE(idmap_winbind, sam/idmap_winbind.o, "bin/idmap_winbind.$SHLIBEXT", IDMAP)
+SMB_MODULE(idmap_ldap, sam/idmap_ldap.o, "bin/idmap_ldap.$SHLIBEXT", IDMAP)
+SMB_MODULE(idmap_tdb, sam/idmap_tdb.o, "bin/idmap_tdb.$SHLIBEXT", IDMAP)
SMB_SUBSYSTEM(IDMAP)
SMB_MODULE(charset_weird, modules/weird.o, "bin/weird.$SHLIBEXT", CHARSET)
diff --git a/source3/sam/idmap_ldap.c b/source3/sam/idmap_ldap.c
index 33cf5fb030..22d9fd0666 100644
--- a/source3/sam/idmap_ldap.c
+++ b/source3/sam/idmap_ldap.c
@@ -833,6 +833,5 @@ static struct idmap_methods ldap_methods = {
NTSTATUS idmap_ldap_init(void)
{
- DEBUG(0,("idmap_reg_ldap: no LDAP support\n"));
return smb_register_idmap(SMB_IDMAP_INTERFACE_VERSION, "ldap", &ldap_methods);
}