diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2005-12-15 02:39:29 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:47:24 -0500 |
| commit | 6589e93b1b8a61860931a171a0306b270597e1f2 (patch) | |
| tree | 8ce1a046293bd7d3d76abc3613ba300ad4f70658 | |
| parent | c0c55a8168b5231c3b7667a82c41709949375402 (diff) | |
| download | samba-6589e93b1b8a61860931a171a0306b270597e1f2.tar.gz samba-6589e93b1b8a61860931a171a0306b270597e1f2.tar.bz2 samba-6589e93b1b8a61860931a171a0306b270597e1f2.zip | |
r12252: With this change (hack) we can now do an provision onto Samba4's LDAP
server. Now to try another one...
Andrew Bartlett
(This used to be commit 175f616d74ac3567a35713343be0c63c96c5aede)
| -rw-r--r-- | source4/scripting/libjs/provision.js | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/source4/scripting/libjs/provision.js b/source4/scripting/libjs/provision.js index aa4ea5bff8..4cd9e5fa8d 100644 --- a/source4/scripting/libjs/provision.js +++ b/source4/scripting/libjs/provision.js @@ -160,6 +160,9 @@ function ldb_erase(ldb) for (i=0;i<res.length;i++) { ldb.del(res[i].dn); } + /* extra hack to ensure it's gone on remote ldap */ + ldb.del("cn=ROOTDSE"); + var res = ldb.search("(&(|(objectclass=*)(dn=*))(!(dn=@BASEINFO)))", attrs); if (res.length != 0) { ldb_delete(ldb); @@ -237,7 +240,7 @@ function provision_default_paths(subobj) paths.hku = "hku.ldb"; paths.hkpd = "hkpd.ldb"; paths.hkpt = "hkpt.ldb"; - paths.samdb = "sam.ldb"; + paths.samdb = lp.get("sam database"); paths.secrets = "secrets.ldb"; paths.dns = lp.get("private dir") + "/" + subobj.DNSDOMAIN + ".zone"; paths.winsdb = "wins.ldb"; |