summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorGünther Deschner <gd@samba.org>2006-01-13 14:55:08 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 11:06:06 -0500
commit8eba11978decb40f0644909e8e9cb1dbed3391c7 (patch)
treece6428392cf6cae0dcad3c61e5f3d5f3697e31f1 /source3
parent967ab90b175112aabde4da449bef912372da669c (diff)
downloadsamba-8eba11978decb40f0644909e8e9cb1dbed3391c7.tar.gz
samba-8eba11978decb40f0644909e8e9cb1dbed3391c7.tar.bz2
samba-8eba11978decb40f0644909e8e9cb1dbed3391c7.zip
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 (This used to be commit a77e02177dcefaaccf863aa8d237ea35a2ec52d1)
Diffstat (limited to 'source3')
-rw-r--r--source3/Makefile.in4
-rw-r--r--source3/configure.in8
-rw-r--r--source3/sam/idmap_rid.c1
3 files changed, 6 insertions, 7 deletions
diff --git a/source3/Makefile.in b/source3/Makefile.in
index 1876045df0..58d0bb46a1 100644
--- a/source3/Makefile.in
+++ b/source3/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/source3/configure.in b/source3/configure.in
index 22dfa67154..f3f3d44d0b 100644
--- a/source3/configure.in
+++ b/source3/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/source3/sam/idmap_rid.c b/source3/sam/idmap_rid.c
index 4a1ae141b1..eced549a55 100644
--- a/source3/sam/idmap_rid.c
+++ b/source3/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);
}