diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2003-04-24 20:51:16 +0000 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2003-04-24 20:51:16 +0000 |
| commit | 172fe551bc5eb55bd44ddc952b94b6dd47959d48 (patch) | |
| tree | 70602f5e0f2d1f61c826a273ac481a259c33d0c7 | |
| parent | d117c3bf0a53ba79a70a960d4daf3a9da9faadab (diff) | |
| download | samba-172fe551bc5eb55bd44ddc952b94b6dd47959d48.tar.gz samba-172fe551bc5eb55bd44ddc952b94b6dd47959d48.tar.bz2 samba-172fe551bc5eb55bd44ddc952b94b6dd47959d48.zip | |
Move pdb_mysql and pdb_xml from modules/ to passdb/, just like they are
in 3_0
(This used to be commit 9b969f877f8057930fb53da99ee8a0574b4f5531)
| -rw-r--r-- | source3/Makefile.in | 6 | ||||
| -rw-r--r-- | source3/configure.in | 4 | ||||
| -rw-r--r-- | source3/passdb/pdb_mysql.c (renamed from source3/modules/mysql.c) | 0 | ||||
| -rw-r--r-- | source3/passdb/pdb_xml.c (renamed from source3/modules/xml.c) | 0 |
4 files changed, 5 insertions, 5 deletions
diff --git a/source3/Makefile.in b/source3/Makefile.in index 4ad76e4bbb..3e9a6665ac 100644 --- 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 a8049345ca..e9f7016a8a 100644 --- 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 index ec8c6f9ab8..ec8c6f9ab8 100644 --- a/source3/modules/mysql.c +++ b/source3/passdb/pdb_mysql.c diff --git a/source3/modules/xml.c b/source3/passdb/pdb_xml.c index 42503c3d39..42503c3d39 100644 --- a/source3/modules/xml.c +++ b/source3/passdb/pdb_xml.c |