Move pdb_mysql and pdb_xml from modules/ to passdb/, just like they are

in 3_0
(This used to be commit 9b969f877f8057930fb53da99ee8a0574b4f5531)

diff --git a/source3/Makefile.in b/source3/Makefile.in
index 4ad76e4bbb18ec925518222cb79e6eceb72048fc..3e9a6665ac6ffbef1f75752c3e4b62199c93a918 100644 (file)
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -282,8 +282,8 @@ PASSDB_OBJ = $(PASSDB_GET_SET_OBJ) passdb/passdb.o passdb/pdb_interface.o \
                passdb/machine_sid.o passdb/util_sam_sid.o passdb/pdb_compat.o \
                passdb/privileges.o @LDAP_OBJ@ @PDB_STATIC@
 
-XML_OBJ = modules/xml.o
-MYSQL_OBJ = modules/mysql.o
+XML_OBJ = passdb/pdb_xml.o
+MYSQL_OBJ = passdb/pdb_mysql.o
 DEVEL_HELP_OBJ = modules/developer.o
 
 SAM_STATIC_MODULES = sam/sam_plugin.o sam/sam_skel.o sam/sam_ads.o
@@ -1044,7 +1044,7 @@ bin/nisplussam.@SHLIBEXT@: passdb/pdb_nisplus.o
        @$(SHLD) $(LDSHFLAGS) -o $@ passdb/pdb_nisplus.o \
                @SONAMEFLAG@`basename $@`
 
-bin/weird.@SHLIBEXT@: $(DEVEL_HELP_OBJ)
+bin/developer.@SHLIBEXT@: $(DEVEL_HELP_OBJ)
        @echo "Building plugin $@"
        @$(SHLD) $(LDSHFLAGS) -o $@ $(DEVEL_HELP_OBJ) \
                @SONAMEFLAG@`basename $@`

diff --git a/source3/configure.in b/source3/configure.in
index a8049345cac18d3c81950d40947dbd4f7cb42b83..e9f7016a8a7dc00f0ca16944e9142034d9c95eab 100644 (file)
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -3425,9 +3425,9 @@ AC_ARG_WITH(shared-modules,
        done
 fi ])
 
-SMB_MODULE(pdb_xml, modules/xml.o, "bin/xml.$SHLIBEXT", PDB,
+SMB_MODULE(pdb_xml, passdb/pdb_xml.o, "bin/xml.$SHLIBEXT", PDB,
                  [ PASSDBLIBS="$PASSDBLIBS $XML_LIBS" ] )
-SMB_MODULE(pdb_mysql, modules/mysql.o, "bin/mysql.$SHLIBEXT", PDB, 
+SMB_MODULE(pdb_mysql, passdb/pdb_mysql.o, "bin/mysql.$SHLIBEXT", PDB, 
                   [ PASSDBLIBS="$PASSDBLIBS $MYSQL_LIBS" ]     )
 SMB_MODULE(pdb_ldap, passdb/pdb_ldap.o, "bin/ldapsam.$SHLIBEXT", PDB, 
                   [ PASSDBLIBS="$PASSDBLIBS $LDAP_LIBS" ] )

diff --git a/source3/modules/mysql.c b/source3/passdb/pdb_mysql.c
similarity index 100%
rename from source3/modules/mysql.c
rename to source3/passdb/pdb_mysql.c

diff --git a/source3/modules/xml.c b/source3/passdb/pdb_xml.c
similarity index 100%
rename from source3/modules/xml.c
rename to source3/passdb/pdb_xml.c