diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2008-01-11 15:21:23 +1100 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2008-01-11 15:21:23 +1100 |
| commit | 48c2d871ea4864fcce47fc5e1fab926ce81de854 (patch) | |
| tree | 523dfb59a5dd2f262a41e8f643bdba47069e7ae8 | |
| parent | ac4810f1bb8984971a98d30c6a3b0b29367d1e2e (diff) | |
| download | samba-48c2d871ea4864fcce47fc5e1fab926ce81de854.tar.gz samba-48c2d871ea4864fcce47fc5e1fab926ce81de854.tar.bz2 samba-48c2d871ea4864fcce47fc5e1fab926ce81de854.zip | |
Use 'dn' less, as this is not a valid attribute in AD, and I want to
remove it from ldb. It is not longer mapped against OpenLDAP.
Andrew Bartlett
(This used to be commit f917ccec85f854423f423bbffc41459d92960a1b)
| -rw-r--r-- | source4/scripting/libjs/provision.js | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source4/scripting/libjs/provision.js b/source4/scripting/libjs/provision.js index 0da02ae276..266bac1a75 100644 --- a/source4/scripting/libjs/provision.js +++ b/source4/scripting/libjs/provision.js @@ -170,7 +170,7 @@ function ldb_erase(info, ldb) /* and the rest */ attrs = new Array("dn"); var basedn = ""; - var res = ldb.search("(&(|(objectclass=*)(dn=*))(!(dn=@BASEINFO)))", basedn, ldb.SCOPE_SUBTREE, attrs); + var res = ldb.search("(&(|(objectclass=*)(distinguishedName=*))(!(distinguishedName=@BASEINFO)))", basedn, ldb.SCOPE_SUBTREE, attrs); var i; if (res.error != 0) { ldb_delete(info, ldb); @@ -180,7 +180,7 @@ function ldb_erase(info, ldb) ldb.del(res.msgs[i].dn); } - var res = ldb.search("(&(|(objectclass=*)(dn=*))(!(dn=@BASEINFO)))", basedn, ldb.SCOPE_SUBTREE, attrs); + var res = ldb.search("(&(|(objectclass=*)(distinguishedName=*))(!(distinguishedName=@BASEINFO)))", basedn, ldb.SCOPE_SUBTREE, attrs); if (res.error != 0 || res.msgs.length != 0) { ldb_delete(info, ldb); return; @@ -207,8 +207,8 @@ function ldb_erase_partitions(info, ldb, ldapbackend) return; } for (j=0; j<res.msgs[0].namingContexts.length; j++) { - var anything = "(|(objectclass=*)(dn=*))"; - var attrs = new Array("dn"); + var anything = "(|(objectclass=*)(distinguishedName=*))"; + var attrs = new Array("distinguishedName"); var basedn = res.msgs[0].namingContexts[j]; var k; var previous_remaining = 1; |