summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2010-04-26 14:39:15 +1000
committerAndrew Tridgell <tridge@samba.org>2010-04-26 19:06:06 +1000
commit267e0b361693a94be258a21b2b305c5a97de3dda (patch)
tree89664a075a4f2f2e0937df1619d3e7512976e1ee /source4
parent0a47bf5f15c8fc083125a90cf73ad1a04dc61e48 (diff)
downloadsamba-267e0b361693a94be258a21b2b305c5a97de3dda.tar.gz
samba-267e0b361693a94be258a21b2b305c5a97de3dda.tar.bz2
samba-267e0b361693a94be258a21b2b305c5a97de3dda.zip
s4-drs: make links to foreign partitions non-fatal
DN links outside the set of partitions we are replication should be allowed. Pair-Programmed-With: Andrew Bartlett <abartlet@samba.org>
Diffstat (limited to 'source4')
-rw-r--r--source4/dsdb/samdb/ldb_modules/repl_meta_data.c14
1 files changed, 6 insertions, 8 deletions
diff --git a/source4/dsdb/samdb/ldb_modules/repl_meta_data.c b/source4/dsdb/samdb/ldb_modules/repl_meta_data.c
index efb44bfd4c..9dcf24a6cb 100644
--- a/source4/dsdb/samdb/ldb_modules/repl_meta_data.c
+++ b/source4/dsdb/samdb/ldb_modules/repl_meta_data.c
@@ -213,10 +213,9 @@ static int replmd_process_backlink(struct ldb_module *module, struct la_backlink
*/
ret = dsdb_module_dn_by_guid(module, tmp_ctx, &bl->target_guid, &target_dn);
if (ret != LDB_SUCCESS) {
- ldb_asprintf_errstring(ldb, "Failed to find target DN for linked attribute with GUID %s\n",
- GUID_string(bl, &bl->target_guid));
- talloc_free(tmp_ctx);
- return ret;
+ DEBUG(2,(__location__ ": WARNING: Failed to find target DN for linked attribute with GUID %s\n",
+ GUID_string(bl, &bl->target_guid)));
+ return LDB_SUCCESS;
}
ret = dsdb_module_dn_by_guid(module, tmp_ctx, &bl->forward_guid, &source_dn);
@@ -3720,10 +3719,9 @@ linked_attributes[0]:
old DN value */
ret = dsdb_module_dn_by_guid(module, dsdb_dn, &guid, &dsdb_dn->dn);
if (ret != LDB_SUCCESS) {
- ldb_asprintf_errstring(ldb, __location__ ": Failed to re-resolve GUID %s",
- GUID_string(tmp_ctx, &guid));
- talloc_free(tmp_ctx);
- return ret;
+ DEBUG(2,(__location__ ": WARNING: Failed to re-resolve GUID %s - using %s",
+ GUID_string(tmp_ctx, &guid),
+ ldb_dn_get_linearized(dsdb_dn->dn)));
}
/* see if this link already exists */