r9827: Convert 'passdb backend' rather then 'passdb backends'

Be a bit more verbose

diff --git a/source/lib/samba3/samba3.c b/source/lib/samba3/samba3.c
index b9bb6d736215eea398558a0d7651868b8650a33d..51a442722b3be7bfdb7136071bea323ea6bafaff 100644 (file)
--- a/source/lib/samba3/samba3.c
+++ b/source/lib/samba3/samba3.c
@@ -37,7 +37,7 @@ NTSTATUS samba3_read_passdb_backends(TALLOC_CTX *ctx, const char *libdir, struct
        char *dbfile;
        NTSTATUS status = NT_STATUS_OK;
        int i;
-       const char **backends = param_get_string_list(samba3->configuration, NULL, "passdb backends", NULL);
+       const char **backends = param_get_string_list(samba3->configuration, NULL, "passdb backend", NULL);
 
        /* Default to smbpasswd */
        if (backends == NULL) 
@@ -45,6 +45,7 @@ NTSTATUS samba3_read_passdb_backends(TALLOC_CTX *ctx, const char *libdir, struct
        else
                backends = str_list_copy(ctx, backends);
 
+
        for (i = 0; backends[i]; i++) {
                if (!strncmp(backends[i], "tdbsam", strlen("tdbsam"))) {
                        const char *p = strchr(backends[i], ':');

diff --git a/source/script/tests/test_s3upgrade.sh b/source/script/tests/test_s3upgrade.sh
index b0042bed453a558159fd348e73c9ca18db2afd27..50aa52f0679a7159bc19ae392c8b6d3b252ec2d5 100755 (executable)
--- a/source/script/tests/test_s3upgrade.sh
+++ b/source/script/tests/test_s3upgrade.sh
@@ -3,7 +3,7 @@ PREFIX=$1
 
 if [ -z "$PREFIX" ]
 then
-       print "Usage: test_s3upgrade.sh <prefix"
+       echo "Usage: test_s3upgrade.sh <prefix>"
        exit 1
 fi
 

diff --git a/source/scripting/libjs/upgrade.js b/source/scripting/libjs/upgrade.js
index 4fe6b8cc1ec62bc1f13d0876135307a5ea30d108..0b5a71e50c935682b2be6af9fab4895912d3c107 100644 (file)
--- a/source/scripting/libjs/upgrade.js
+++ b/source/scripting/libjs/upgrade.js
@@ -422,7 +422,7 @@ function upgrade(subobj, samba3, message, paths)
 
        // figure out ldapurl, if applicable
        var ldapurl = undefined;
-       var pdb = samba3.configuration.get_list("passdb backends");
+       var pdb = samba3.configuration.get_list("passdb backend");
        if (pdb != undefined) {
                for (var b in pdb) {
                        if (substr(pdb[b], 0, 7) == "ldapsam") {
@@ -438,6 +438,7 @@ function upgrade(subobj, samba3, message, paths)
 
        // Enable samba3sam module if original passdb backend was ldap
        if (ldapurl != undefined) {
+               message("Enabling Samba3 LDAP mappings for SAM database\n");
                var ldif = sprintf("
 dn: @MAP=samba3sam
 @MAP_URL: %s", ldapurl);