summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2005-10-28 07:00:52 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:45:26 -0500
commitc5b99e3c696939f432b865e938caf31439385edf (patch)
treee478b09e8b5f1ddf0853a22d9ef9c0cdd45d6e97
parentb0dd4140c5c8cdd1dd2aed154ccbbcf1aadf9975 (diff)
downloadsamba-c5b99e3c696939f432b865e938caf31439385edf.tar.gz
samba-c5b99e3c696939f432b865e938caf31439385edf.tar.bz2
samba-c5b99e3c696939f432b865e938caf31439385edf.zip
r11363: fixed a problem with provisioning when hklm already exists (the
problem is really caused by hklm not having objectclass attributes on its records, but this is a workaround) (This used to be commit 62d5253a033f47335ceefade9ad7d98ddfc19584)
-rw-r--r--source4/scripting/libjs/provision.js3
1 files changed, 1 insertions, 2 deletions
diff --git a/source4/scripting/libjs/provision.js b/source4/scripting/libjs/provision.js
index 101110ea3e..6b76d2bc1f 100644
--- a/source4/scripting/libjs/provision.js
+++ b/source4/scripting/libjs/provision.js
@@ -157,7 +157,7 @@ function ldb_erase(ldb)
for (i=0;i<res.length;i++) {
ldb.del(res[i].dn);
}
- res = ldb.search("(objectclass=*)", attrs);
+ res = ldb.search("(|(objectclass=*)(dn=*))", attrs);
if (res.length != 0) {
ldb_delete(ldb);
return;
@@ -165,7 +165,6 @@ function ldb_erase(ldb)
assert(res.length == 0);
}
-
/*
setup a ldb in the private dir
*/