- Fix modules build of pdb_mysql and pdb_xml

- Fix typo in script/installswat.sh
(This used to be commit 8d2aec7a73d41a9d32c10abd1c8833ebfd41dd77)

diff --git a/source3/passdb/pdb_mysql.c b/source3/passdb/pdb_mysql.c
index 8af16bd78730f6e0e1c99887d0273bf78bc4f95f..f3cb998ee156e602eb23402ad5ef9190f51171ea 100644 (file)
--- 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 add5b924b84039ace00232339a12a32df9ccae0f..53285afd243f619d00a26949f2894e0ebdfc7808 100644 (file)
--- 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 c66604cdb84e40d8e0d8b1d612caa94ebf50f961..d1f8ea191d93603cce7ba88594d4f76e2b9bda18 100755 (executable)
--- 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/