The branch, v4-0-test has been updated
via 53b51660ae6b733b19b0ba3403f229b215de7b47 (commit)
via f917ccec85f854423f423bbffc41459d92960a1b (commit)
via 47a1b76f7fff30229d3f23c6723f047923faf196 (commit)
from cbf3b74e5f5076d864b08c772f21b20751ea5163 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v4-0-test
- Log -----------------------------------------------------------------
commit 53b51660ae6b733b19b0ba3403f229b215de7b47
Merge: f917ccec85f854423f423bbffc41459d92960a1b
cbf3b74e5f5076d864b08c772f21b20751ea5163
Author: Andrew Bartlett <[EMAIL PROTECTED]>
Date: Fri Jan 11 15:22:22 2008 +1100
Merge branch 'v4-0-test' of git://git.samba.org/samba into 4-0-local
commit f917ccec85f854423f423bbffc41459d92960a1b
Author: Andrew Bartlett <[EMAIL PROTECTED]>
Date: Fri Jan 11 15:21:23 2008 +1100
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
commit 47a1b76f7fff30229d3f23c6723f047923faf196
Author: Andrew Bartlett <[EMAIL PROTECTED]>
Date: Fri Jan 11 15:19:27 2008 +1100
Remove 'dn' from mapping, it isn't a valid attribute in AD, and causes
problems with ldap.js test with OpenLDAP as the backend.
Likewise, remove it from the template lookup (for consistancy).
TODO: see if it can be removed from ldb
Andrew Bartlett
-----------------------------------------------------------------------
Summary of changes:
source/dsdb/samdb/ldb_modules/simple_ldap_map.c | 18 ------------------
source/dsdb/samdb/samdb.c | 2 +-
source/scripting/libjs/provision.js | 8 ++++----
3 files changed, 5 insertions(+), 23 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/dsdb/samdb/ldb_modules/simple_ldap_map.c
b/source/dsdb/samdb/ldb_modules/simple_ldap_map.c
index 91001d4..9701067 100644
--- a/source/dsdb/samdb/ldb_modules/simple_ldap_map.c
+++ b/source/dsdb/samdb/ldb_modules/simple_ldap_map.c
@@ -376,15 +376,6 @@ static const struct ldb_map_attribute
entryuuid_attributes[] =
}
},
{
- .local_name = "dn",
- .type = MAP_RENAME,
- .u = {
- .rename = {
- .remote_name = "entryDN"
- }
- }
- },
- {
.local_name = "groupType",
.type = MAP_CONVERT,
.u = {
@@ -534,15 +525,6 @@ static const struct ldb_map_attribute
nsuniqueid_attributes[] =
}
},
{
- .local_name = "dn",
- .type = MAP_RENAME,
- .u = {
- .rename = {
- .remote_name = "entryDN"
- }
- }
- },
- {
.local_name = "groupType",
.type = MAP_CONVERT,
.u = {
diff --git a/source/dsdb/samdb/samdb.c b/source/dsdb/samdb/samdb.c
index b042d1d..c11eea1 100644
--- a/source/dsdb/samdb/samdb.c
+++ b/source/dsdb/samdb/samdb.c
@@ -134,7 +134,7 @@ int samdb_copy_template(struct ldb_context *ldb,
}
/* pull the template record */
- ret = ldb_search(templates_ldb, basedn, LDB_SCOPE_BASE, "(dn=*)", NULL,
&res);
+ ret = ldb_search(templates_ldb, basedn, LDB_SCOPE_BASE,
"distinguishedName=*", NULL, &res);
talloc_free(basedn);
if (ret != LDB_SUCCESS) {
*errstring = talloc_steal(msg, ldb_errstring(templates_ldb));
diff --git a/source/scripting/libjs/provision.js
b/source/scripting/libjs/provision.js
index 0da02ae..266bac1 100644
--- a/source/scripting/libjs/provision.js
+++ b/source/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=*))(!([EMAIL
PROTECTED])))", basedn, ldb.SCOPE_SUBTREE, attrs);
+ var res =
ldb.search("(&(|(objectclass=*)(distinguishedName=*))(!([EMAIL PROTECTED])))",
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=*))(!([EMAIL
PROTECTED])))", basedn, ldb.SCOPE_SUBTREE, attrs);
+ var res =
ldb.search("(&(|(objectclass=*)(distinguishedName=*))(!([EMAIL PROTECTED])))",
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;
--
Samba Shared Repository
