sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-23 09:57:40 +03:00
Code

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

Browse Source 
Be a bit more verbose
(This used to be commit fb2fd8da10b281b2064d4cae5d5a0630e8a207da)
This commit is contained in:
Jelmer Vernooij 2005-08-31 14:27:17 +00:00 committed by Gerald (Jerry) Carter
parent adf31c5042
commit d991196655
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
source4/lib/samba3/samba3.c
View File

@ -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], ':');

2
source4/script/tests/test_s3upgrade.sh
View File

@ -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

3
source4/scripting/libjs/upgrade.js
View File

@ -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);