r12904: Fix #3264, allow to load idmap_ad with "idmap backend = ad".

Finally cleanup the way idmap modules are build and loaded, idmap_rid
now will have to be loaded without prefix, just "rid".

Guenther

diff --git a/source/Makefile.in b/source/Makefile.in
index 1876045df0186c9de8e4a8e32ebfa3a76a7351e1..58d0bb46a150763aa3e87cacc9803904805d55bb 100644 (file)
--- a/source/Makefile.in
+++ b/source/Makefile.in
@@ -1239,12 +1239,12 @@ bin/smbpasswd.@SHLIBEXT@: passdb/pdb_smbpasswd.@PICSUFFIX@
        @$(SHLD) $(LDSHFLAGS) -o $@ passdb/pdb_smbpasswd.@PICSUFFIX@ \
                @SONAMEFLAG@`basename $@`
 
-bin/idmap_rid.@SHLIBEXT@: sam/idmap_rid.@PICSUFFIX@
+bin/rid.@SHLIBEXT@: sam/idmap_rid.@PICSUFFIX@
        @echo "Building plugin $@"
        @$(SHLD) $(LDSHFLAGS) -o $@ sam/idmap_rid.@PICSUFFIX@ \
                @SONAMEFLAG@`basename $@`
 
-bin/idmap_ad.@SHLIBEXT@: sam/idmap_ad.@PICSUFFIX@
+bin/ad.@SHLIBEXT@: sam/idmap_ad.@PICSUFFIX@
        @echo "Building plugin $@"
        @$(SHLD) $(LDSHFLAGS) -o $@ sam/idmap_ad.@PICSUFFIX@ \
                @SONAMEFLAG@`basename $@`

diff --git a/source/configure.in b/source/configure.in
index 22dfa6715423075cb3b6d7fd140e509c83fb2c06..f3f3d44d0bf7a199c807214c47925dc9b9e968f8 100644 (file)
--- a/source/configure.in
+++ b/source/configure.in
@@ -5160,10 +5160,10 @@ 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,smbd/server.o)
 
-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_MODULE(idmap_rid, sam/idmap_rid.o, "bin/idmap_rid.$SHLIBEXT", IDMAP)
-SMB_MODULE(idmap_ad, sam/idmap_ad.o, "bin/idmap_ad.$SHLIBEXT", IDMAP)
+SMB_MODULE(idmap_ldap, sam/idmap_ldap.o, "bin/ldap.$SHLIBEXT", IDMAP)
+SMB_MODULE(idmap_tdb, sam/idmap_tdb.o, "bin/tdb.$SHLIBEXT", IDMAP)
+SMB_MODULE(idmap_rid, sam/idmap_rid.o, "bin/rid.$SHLIBEXT", IDMAP)
+SMB_MODULE(idmap_ad, sam/idmap_ad.o, "bin/ad.$SHLIBEXT", IDMAP)
 SMB_SUBSYSTEM(IDMAP,sam/idmap.o)
 
 SMB_MODULE(charset_weird, modules/weird.o, "bin/weird.$SHLIBEXT", CHARSET)

diff --git a/source/sam/idmap_rid.c b/source/sam/idmap_rid.c
index 4a1ae141b106ae8ac87851382d4729065de2a10b..eced549a55734febae7c8bdb93bcee8a75223231 100644 (file)
--- a/source/sam/idmap_rid.c
+++ b/source/sam/idmap_rid.c
@@ -555,7 +555,6 @@ static struct idmap_methods rid_methods = {
 
 NTSTATUS init_module(void)
 {
-       return smb_register_idmap(SMB_IDMAP_INTERFACE_VERSION, "idmap_rid", &rid_methods);
        return smb_register_idmap(SMB_IDMAP_INTERFACE_VERSION, "rid", &rid_methods);
 }