summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2012-12-07 12:56:21 +0000
committerMichael Adam <obnox@samba.org>2012-12-07 16:04:40 +0100
commit734d14b54834a4d03e67bcaece4f4e3cf1d10925 (patch)
treed4abb2b6a21d9db0c36dac0ea9b01c6802a36d36
parent802124789513ef207a154ee950dc03e66a80e0b1 (diff)
downloadsamba-734d14b54834a4d03e67bcaece4f4e3cf1d10925.tar.gz
samba-734d14b54834a4d03e67bcaece4f4e3cf1d10925.tar.bz2
samba-734d14b54834a4d03e67bcaece4f4e3cf1d10925.zip
s4:dsdb/descriptor: fix replication of NC heads
The sub NC heads maybe replicated with the parent partition, if we don't need to recalculate the nTSecurityDescriptor attribute in that case, the replication of the of the sub partition should handle that. This fixes error messages like this: descriptor_sd_propagation_recursive: DC=ForestDnsZones,DC=s40dom,DC=base not found under DC=s40dom,DC=base Signed-off-by: Stefan Metzmacher <metze@samba.org> Reviewed-by: Michael Adam <obnox@samba.org>
-rw-r--r--source4/dsdb/samdb/ldb_modules/descriptor.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/source4/dsdb/samdb/ldb_modules/descriptor.c b/source4/dsdb/samdb/ldb_modules/descriptor.c
index 95204b3c5c..192c745e25 100644
--- a/source4/dsdb/samdb/ldb_modules/descriptor.c
+++ b/source4/dsdb/samdb/ldb_modules/descriptor.c
@@ -1192,12 +1192,12 @@ static int descriptor_sd_propagation_recursive(struct ldb_module *module,
msg);
if (msg == NULL) {
- ldb_debug_set(ldb, LDB_DEBUG_FATAL,
+ ldb_debug(ldb, LDB_DEBUG_WARNING,
"descriptor_sd_propagation_recursive: "
"%s not found under %s",
ldb_dn_get_linearized(c->dn),
ldb_dn_get_linearized(change->dn));
- return LDB_ERR_OPERATIONS_ERROR;
+ continue;
}
msg->elements = (struct ldb_message_element *)c;