summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2003-04-21 01:04:17 +0000
committerJelmer Vernooij <jelmer@samba.org>2003-04-21 01:04:17 +0000
commit858137d0dd8672f25e4bfe21ce79ff280bd2457b (patch)
treea881ee452ab85f61563b6a32d4405240fcf5906e
parent0971cbb9eb2ba429b61292ee77985e56c2ab4be1 (diff)
downloadsamba-858137d0dd8672f25e4bfe21ce79ff280bd2457b.tar.gz
samba-858137d0dd8672f25e4bfe21ce79ff280bd2457b.tar.bz2
samba-858137d0dd8672f25e4bfe21ce79ff280bd2457b.zip
- Fix modules build of pdb_mysql and pdb_xml
- Fix typo in script/installswat.sh (This used to be commit 8d2aec7a73d41a9d32c10abd1c8833ebfd41dd77)
-rw-r--r--source3/passdb/pdb_mysql.c5
-rw-r--r--source3/passdb/pdb_xml.c7
-rwxr-xr-xsource3/script/installswat.sh2
3 files changed, 4 insertions, 10 deletions
diff --git a/source3/passdb/pdb_mysql.c b/source3/passdb/pdb_mysql.c
index 8af16bd787..f3cb998ee1 100644
--- a/source3/passdb/pdb_mysql.c
+++ b/source3/passdb/pdb_mysql.c
@@ -1034,8 +1034,5 @@ static NTSTATUS mysqlsam_init(struct pdb_context * pdb_context, struct pdb_metho
int pdb_mysql_init()
{
- if(smb_register_passdb("mysql", mysqlsam_init, PASSDB_INTERFACE_VERSION))
- return 0;
-
- return 1;
+ return smb_register_passdb("mysql", mysqlsam_init, PASSDB_INTERFACE_VERSION);
}
diff --git a/source3/passdb/pdb_xml.c b/source3/passdb/pdb_xml.c
index add5b924b8..53285afd24 100644
--- a/source3/passdb/pdb_xml.c
+++ b/source3/passdb/pdb_xml.c
@@ -534,7 +534,7 @@ NTSTATUS xmlsam_init(PDB_CONTEXT * pdb_context, PDB_METHODS ** pdb_method,
return nt_status;
}
- (*pdb_method)->name = "xmlsam";
+ (*pdb_method)->name = "xml";
(*pdb_method)->setsampwent = xmlsam_setsampwent;
(*pdb_method)->endsampwent = xmlsam_endsampwent;
@@ -566,8 +566,5 @@ NTSTATUS xmlsam_init(PDB_CONTEXT * pdb_context, PDB_METHODS ** pdb_method,
int pdb_xml_init()
{
- if(smb_register_passdb("xml", xmlsam_init, PASSDB_INTERFACE_VERSION))
- return 0;
-
- return 1;
+ return smb_register_passdb("xml", xmlsam_init, PASSDB_INTERFACE_VERSION);
}
diff --git a/source3/script/installswat.sh b/source3/script/installswat.sh
index c66604cdb8..d1f8ea191d 100755
--- a/source3/script/installswat.sh
+++ b/source3/script/installswat.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-#fist version March 1998, Andrew Tridgell
+#first version March 1998, Andrew Tridgell
SWATDIR=$1
SRCDIR=$2/