added idmap_ldap to wrong branch.

diff --git a/source/configure.in b/source/configure.in
index d0e7f44078b45183cf55da19a251c4e2a54c0ffd..79f01ba4219e3665e583dd78460629b9582b7264 100644 (file)
--- a/source/configure.in
+++ b/source/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/source/sam/idmap_ldap.c b/source/sam/idmap_ldap.c
index 33cf5fb03026d5c81991ae93b0c1a6fd62a995ba..22d9fd0666ad97c23d8d1c002b77f1bd3365d835 100644 (file)
--- a/source/sam/idmap_ldap.c
+++ b/source/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);
 }