summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2008-07-15 22:22:34 +1000
committerAndrew Bartlett <abartlet@samba.org>2008-07-15 22:22:34 +1000
commit1d3bdf3f546c4ad849333cd743bc97646775c509 (patch)
tree4d85cb1a497364282668590c4ea1cd9c79448697
parentc46afc8c447e3edb1dc81777700753b98aaa0f93 (diff)
parentd904b71879cf980f602bfd400cf98396616c13e1 (diff)
downloadsamba-1d3bdf3f546c4ad849333cd743bc97646775c509.tar.gz
samba-1d3bdf3f546c4ad849333cd743bc97646775c509.tar.bz2
samba-1d3bdf3f546c4ad849333cd743bc97646775c509.zip
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-abartlet
Conflicts: source/dsdb/samdb/ldb_modules/simple_ldap_map.c (This used to be commit 5d539b7da46e38e7570fa5af4549b142f25e4585)
-rw-r--r--source4/dsdb/samdb/ldb_modules/simple_ldap_map.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/source4/dsdb/samdb/ldb_modules/simple_ldap_map.c b/source4/dsdb/samdb/ldb_modules/simple_ldap_map.c
index 5da321b9e5..6e967aab2f 100644
--- a/source4/dsdb/samdb/ldb_modules/simple_ldap_map.c
+++ b/source4/dsdb/samdb/ldb_modules/simple_ldap_map.c
@@ -591,7 +591,7 @@ static int entryuuid_init(struct ldb_module *module)
static int nsuniqueid_init(struct ldb_module *module)
{
int ret;
- ret = ldb_map_init(module, nsuniqueid_attributes, NULL, nsuniqueid_wildcard_attributes, "samba4Top", NULL);
+ ret = ldb_map_init(module, nsuniqueid_attributes, NULL, nsuniqueid_wildcard_attributes, "extensibleObject", NULL);
if (ret != LDB_SUCCESS)
return ret;