From: Andrew Bartlett <abartlet@samba.org>
Date: Tue, 15 Jul 2008 12:22:34 +0000 (+1000)
Subject: Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-abartlet
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5d539b7da46e38e7570fa5af4549b142f25e4585;p=thirdparty%2Fsamba.git

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
---

5d539b7da46e38e7570fa5af4549b142f25e4585
diff --cc source/dsdb/samdb/ldb_modules/simple_ldap_map.c
index 5da321b9e5a,1830e8be7b1..6e967aab2f2
--- a/source/dsdb/samdb/ldb_modules/simple_ldap_map.c
+++ b/source/dsdb/samdb/ldb_modules/simple_ldap_map.c
@@@ -591,7 -676,10 +591,7 @@@ static int entryuuid_init(struct ldb_mo
  static int nsuniqueid_init(struct ldb_module *module)
  {
          int ret;
- 	ret = ldb_map_init(module, nsuniqueid_attributes, NULL, nsuniqueid_wildcard_attributes, "samba4Top", NULL);
 -	struct map_private *map_private;
 -	struct entryuuid_private *entryuuid_private;
 -
+ 	ret = ldb_map_init(module, nsuniqueid_attributes, NULL, nsuniqueid_wildcard_attributes, "extensibleObject", NULL);
          if (ret != LDB_SUCCESS)
                  return ret;