Merge branch 'v4-0-test' of git://git.samba.org/samba into 4-0-local
authorAndrew Bartlett <abartlet@samba.org>
Fri, 11 Jan 2008 04:22:22 +0000 (15:22 +1100)
committerAndrew Bartlett <abartlet@samba.org>
Fri, 11 Jan 2008 04:22:22 +0000 (15:22 +1100)
(This used to be commit 53b51660ae6b733b19b0ba3403f229b215de7b47)

source4/dsdb/samdb/ldb_modules/simple_ldap_map.c
source4/dsdb/samdb/samdb.c
source4/scripting/libjs/provision.js

index 91001d43d7a078f9f45e5409782243ad7547e8a9..970106787be825342271366086823c5e4ae9e5d7 100644 (file)
@@ -375,15 +375,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,
@@ -533,15 +524,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,
index b042d1d3b7bcd0ccaffc717740adb43edc637f33..c11eea1757c99a0649c6f79251d6aba413eeb010 100644 (file)
@@ -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));
index 0da02ae276837fc6f271e1075451afca757a5d85..266bac1a75d70909b944587f7d751fa047d10e7d 100644 (file)
@@ -170,7 +170,7 @@ function ldb_erase(info, ldb)
        /* and the rest */
        attrs = new Array("dn");
        var basedn = "";
-       var res = ldb.search("(&(|(objectclass=*)(dn=*))(!(dn=@BASEINFO)))", basedn, ldb.SCOPE_SUBTREE, attrs);
+       var res = ldb.search("(&(|(objectclass=*)(distinguishedName=*))(!(distinguishedName=@BASEINFO)))", 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=*))(!(dn=@BASEINFO)))", basedn, ldb.SCOPE_SUBTREE, attrs);
+       var res = ldb.search("(&(|(objectclass=*)(distinguishedName=*))(!(distinguishedName=@BASEINFO)))", 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;