diff options
| -rw-r--r-- | source4/lib/samba3/samba3.c | 3 | ||||
| -rwxr-xr-x | source4/script/tests/test_s3upgrade.sh | 2 | ||||
| -rw-r--r-- | source4/scripting/libjs/upgrade.js | 3 |
3 files changed, 5 insertions, 3 deletions
diff --git a/source4/lib/samba3/samba3.c b/source4/lib/samba3/samba3.c index b9bb6d7362..51a442722b 100644 --- a/source4/lib/samba3/samba3.c +++ b/source4/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/source4/script/tests/test_s3upgrade.sh b/source4/script/tests/test_s3upgrade.sh index b0042bed45..50aa52f067 100755 --- a/source4/script/tests/test_s3upgrade.sh +++ b/source4/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/source4/scripting/libjs/upgrade.js b/source4/scripting/libjs/upgrade.js index 4fe6b8cc1e..0b5a71e50c 100644 --- a/source4/scripting/libjs/upgrade.js +++ b/source4/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); |