git.samba.org
/
samba.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use 'dn' less, as this is not a valid attribute in AD, and I want to
[samba.git]
/
source4
/
scripting
/
libjs
/
provision.js
diff --git
a/source4/scripting/libjs/provision.js
b/source4/scripting/libjs/provision.js
index 0da02ae276837fc6f271e1075451afca757a5d85..266bac1a75d70909b944587f7d751fa047d10e7d 100644
(file)
--- 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 = "";
/* and the rest */
attrs = new Array("dn");
var basedn = "";
- var res = ldb.search("(&(|(objectclass=*)(d
n=*))(!(dn
=@BASEINFO)))", basedn, ldb.SCOPE_SUBTREE, attrs);
+ var res = ldb.search("(&(|(objectclass=*)(d
istinguishedName=*))(!(distinguishedName
=@BASEINFO)))", basedn, ldb.SCOPE_SUBTREE, attrs);
var i;
if (res.error != 0) {
ldb_delete(info, ldb);
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);
}
ldb.del(res.msgs[i].dn);
}
- var res = ldb.search("(&(|(objectclass=*)(d
n=*))(!(dn
=@BASEINFO)))", basedn, ldb.SCOPE_SUBTREE, attrs);
+ var res = ldb.search("(&(|(objectclass=*)(d
istinguishedName=*))(!(distinguishedName
=@BASEINFO)))", basedn, ldb.SCOPE_SUBTREE, attrs);
if (res.error != 0 || res.msgs.length != 0) {
ldb_delete(info, ldb);
return;
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++) {
return;
}
for (j=0; j<res.msgs[0].namingContexts.length; j++) {
- var anything = "(|(objectclass=*)(d
n
=*))";
- var attrs = new Array("d
n
");
+ var anything = "(|(objectclass=*)(d
istinguishedName
=*))";
+ var attrs = new Array("d
istinguishedName
");
var basedn = res.msgs[0].namingContexts[j];
var k;
var previous_remaining = 1;
var basedn = res.msgs[0].namingContexts[j];
var k;
var previous_remaining = 1;