diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2005-09-01 15:33:31 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:36:21 -0500 |
| commit | e2e2508b586a112e612bf3660f80d25c9bf8bc90 (patch) | |
| tree | 7dabda32e3e7cd3779460eca08816df449bb29c1 /source4/scripting | |
| parent | 6ff97621fa744404ec3da6a4d38031eeec4741b3 (diff) | |
| download | samba-e2e2508b586a112e612bf3660f80d25c9bf8bc90.tar.gz samba-e2e2508b586a112e612bf3660f80d25c9bf8bc90.tar.bz2 samba-e2e2508b586a112e612bf3660f80d25c9bf8bc90.zip | |
r9899: Be more conservative about what is sent to the remote server in ldb_map.
(This used to be commit 76e943d4416e38ce4cce27d5403bc3e133d0025b)
Diffstat (limited to 'source4/scripting')
| -rw-r--r-- | source4/scripting/libjs/upgrade.js | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/source4/scripting/libjs/upgrade.js b/source4/scripting/libjs/upgrade.js index 45e6884e9f..07fa8f34cc 100644 --- a/source4/scripting/libjs/upgrade.js +++ b/source4/scripting/libjs/upgrade.js @@ -541,11 +541,6 @@ 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); - ok = samdb.add(ldif); - assert(ok); ok = samdb.modify(" dn: @MODULES @@ -557,6 +552,12 @@ replace: @LIST message("Error enabling samba3sam module: " + samdb.errstring() + "\n"); ret = ret + 1; } + + ok = samdb.add(sprintf(" +dn: @MAP=samba3sam +@MAP_URL: %s", ldapurl)); + assert(ok); + } return ret; |