summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2008-07-16 13:00:07 +0200
committerStefan Metzmacher <metze@samba.org>2008-07-16 14:42:11 +0200
commitf3fae86549ee0ea6cef5cee27af7bb53e7963d7b (patch)
treeb8192a09bc719654a2dd05a7deb5a05ec2f4eef1
parenta24fb2b537a57c308385de9fe5149e29740d1d1b (diff)
downloadsamba-f3fae86549ee0ea6cef5cee27af7bb53e7963d7b.tar.gz
samba-f3fae86549ee0ea6cef5cee27af7bb53e7963d7b.tar.bz2
samba-f3fae86549ee0ea6cef5cee27af7bb53e7963d7b.zip
drsuapi: check ctr6->drs_error
metze (This used to be commit 511847f5f5015bcdef69e80b91cb08ffb1690e59)
-rw-r--r--source4/dsdb/repl/drepl_out_helpers.c7
-rw-r--r--source4/libnet/libnet_become_dc.c6
2 files changed, 13 insertions, 0 deletions
diff --git a/source4/dsdb/repl/drepl_out_helpers.c b/source4/dsdb/repl/drepl_out_helpers.c
index e0c3268f9d..694d89dfe3 100644
--- a/source4/dsdb/repl/drepl_out_helpers.c
+++ b/source4/dsdb/repl/drepl_out_helpers.c
@@ -326,6 +326,13 @@ static void dreplsrv_op_pull_source_get_changes_recv(struct rpc_request *req)
return;
}
+ if (ctr_level == 6) {
+ if (!W_ERROR_IS_OK(ctr6->drs_error)) {
+ composite_error(c, werror_to_ntstatus(ctr6->drs_error));
+ return;
+ }
+ }
+
dreplsrv_op_pull_source_apply_changes_send(st, r, ctr_level, ctr1, ctr6);
}
diff --git a/source4/libnet/libnet_become_dc.c b/source4/libnet/libnet_become_dc.c
index 556a51e8af..1f7444062a 100644
--- a/source4/libnet/libnet_become_dc.c
+++ b/source4/libnet/libnet_become_dc.c
@@ -2463,6 +2463,12 @@ static WERROR becomeDC_drsuapi_pull_partition_recv(struct libnet_BecomeDC_state
return WERR_BAD_NET_RESP;
}
+ if (ctr_level == 6) {
+ if (!W_ERROR_IS_OK(ctr6->drs_error)) {
+ return ctr6->drs_error;
+ }
+ }
+
switch (ctr_level) {
case 1:
source_dsa_guid = &ctr1->source_dsa_guid;