Author: gd Date: 2006-01-13 14:55:08 +0000 (Fri, 13 Jan 2006) New Revision: 12904
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=12904 Log: 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 Modified: branches/SAMBA_3_0/source/Makefile.in branches/SAMBA_3_0/source/configure.in branches/SAMBA_3_0/source/sam/idmap_rid.c trunk/source/Makefile.in trunk/source/configure.in trunk/source/sam/idmap_rid.c Changeset: Modified: branches/SAMBA_3_0/source/Makefile.in =================================================================== --- branches/SAMBA_3_0/source/Makefile.in 2006-01-13 12:52:56 UTC (rev 12903) +++ branches/SAMBA_3_0/source/Makefile.in 2006-01-13 14:55:08 UTC (rev 12904) @@ -1239,12 +1239,12 @@ @$(SHLD) $(LDSHFLAGS) -o $@ passdb/[EMAIL PROTECTED]@ \ @[EMAIL PROTECTED] [EMAIL PROTECTED] -bin/[EMAIL PROTECTED]@: sam/[EMAIL PROTECTED]@ +bin/[EMAIL PROTECTED]@: sam/[EMAIL PROTECTED]@ @echo "Building plugin $@" @$(SHLD) $(LDSHFLAGS) -o $@ sam/[EMAIL PROTECTED]@ \ @[EMAIL PROTECTED] [EMAIL PROTECTED] -bin/[EMAIL PROTECTED]@: sam/[EMAIL PROTECTED]@ +bin/[EMAIL PROTECTED]@: sam/[EMAIL PROTECTED]@ @echo "Building plugin $@" @$(SHLD) $(LDSHFLAGS) -o $@ sam/[EMAIL PROTECTED]@ \ @[EMAIL PROTECTED] [EMAIL PROTECTED] Modified: branches/SAMBA_3_0/source/configure.in =================================================================== --- branches/SAMBA_3_0/source/configure.in 2006-01-13 12:52:56 UTC (rev 12903) +++ branches/SAMBA_3_0/source/configure.in 2006-01-13 14:55:08 UTC (rev 12904) @@ -5160,10 +5160,10 @@ 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) Modified: branches/SAMBA_3_0/source/sam/idmap_rid.c =================================================================== --- branches/SAMBA_3_0/source/sam/idmap_rid.c 2006-01-13 12:52:56 UTC (rev 12903) +++ branches/SAMBA_3_0/source/sam/idmap_rid.c 2006-01-13 14:55:08 UTC (rev 12904) @@ -555,7 +555,6 @@ 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); } Modified: trunk/source/Makefile.in =================================================================== --- trunk/source/Makefile.in 2006-01-13 12:52:56 UTC (rev 12903) +++ trunk/source/Makefile.in 2006-01-13 14:55:08 UTC (rev 12904) @@ -1268,12 +1268,12 @@ @$(SHLD) $(LDSHFLAGS) -o $@ passdb/[EMAIL PROTECTED]@ \ @[EMAIL PROTECTED] [EMAIL PROTECTED] -bin/[EMAIL PROTECTED]@: sam/[EMAIL PROTECTED]@ +bin/[EMAIL PROTECTED]@: sam/[EMAIL PROTECTED]@ @echo "Building plugin $@" @$(SHLD) $(LDSHFLAGS) -o $@ sam/[EMAIL PROTECTED]@ \ @[EMAIL PROTECTED] [EMAIL PROTECTED] -bin/[EMAIL PROTECTED]@: sam/[EMAIL PROTECTED]@ +bin/[EMAIL PROTECTED]@: sam/[EMAIL PROTECTED]@ @echo "Building plugin $@" @$(SHLD) $(LDSHFLAGS) -o $@ sam/[EMAIL PROTECTED]@ \ @[EMAIL PROTECTED] [EMAIL PROTECTED] Modified: trunk/source/configure.in =================================================================== --- trunk/source/configure.in 2006-01-13 12:52:56 UTC (rev 12903) +++ trunk/source/configure.in 2006-01-13 14:55:08 UTC (rev 12904) @@ -5189,10 +5189,10 @@ SMB_MODULE(rpc_unixinfo, \$(RPC_UNIXINFO_OBJ), "bin/librpc_unixinfo.$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) Modified: trunk/source/sam/idmap_rid.c =================================================================== --- trunk/source/sam/idmap_rid.c 2006-01-13 12:52:56 UTC (rev 12903) +++ trunk/source/sam/idmap_rid.c 2006-01-13 14:55:08 UTC (rev 12904) @@ -549,7 +549,6 @@ 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); }
