dsdb: Catch errors in extended operations (like allocating a RID Set)

[samba.git] / source4 / libnet / py_net.c

diff --git a/source4/libnet/py_net.c b/source4/libnet/py_net.c
index 48009b2be533c52a5ec2b72d54e1bfd6c872b1e1..44bede6cf9d2d6a2f8d86e8fd868840defef5612 100644 (file)
--- a/source4/libnet/py_net.c
+++ b/source4/libnet/py_net.c
@@ -390,8 +390,10 @@ static PyObject *py_net_replicate_chunk(py_net_Object *self, PyObject *args, PyO
        struct replicate_state *s;
        unsigned level;
        unsigned req_level = 0;
-       NTSTATUS (*chunk_handler)(void *private_data, const struct libnet_BecomeDC_StoreChunk *c);
-       NTSTATUS status;
+       WERROR (*chunk_handler)(void *private_data, const struct libnet_BecomeDC_StoreChunk *c);
+       WERROR werr;
+       enum drsuapi_DsExtendedError extended_ret = DRSUAPI_EXOP_ERR_NONE;
+       enum drsuapi_DsExtendedOperation exop = DRSUAPI_EXOP_NONE;
 
        if (!PyArg_ParseTupleAndKeywords(args, kwargs, "OIO|OIO",
                                         discard_const_p(char *, kwnames),
@@ -412,7 +414,10 @@ static PyObject *py_net_replicate_chunk(py_net_Object *self, PyObject *args, PyO
                        return NULL;
                }
                s->chunk.ctr1                         = pytalloc_get_ptr(py_ctr);
-               s->partition.nc                       = *s->chunk.ctr1->naming_context;
+               if (s->chunk.ctr1->naming_context != NULL) {
+                       s->partition.nc = *s->chunk.ctr1->naming_context;
+               }
+               extended_ret = s->chunk.ctr1->extended_ret;
                s->partition.more_data                = s->chunk.ctr1->more_data;
                s->partition.source_dsa_guid          = s->chunk.ctr1->source_dsa_guid;
                s->partition.source_dsa_invocation_id = s->chunk.ctr1->source_dsa_invocation_id;
@@ -423,7 +428,10 @@ static PyObject *py_net_replicate_chunk(py_net_Object *self, PyObject *args, PyO
                        return NULL;
                }
                s->chunk.ctr6                         = pytalloc_get_ptr(py_ctr);
-               s->partition.nc                       = *s->chunk.ctr6->naming_context;
+               if (s->chunk.ctr6->naming_context != NULL) {
+                       s->partition.nc = *s->chunk.ctr6->naming_context;
+               }
+               extended_ret = s->chunk.ctr6->extended_ret;
                s->partition.more_data                = s->chunk.ctr6->more_data;
                s->partition.source_dsa_guid          = s->chunk.ctr6->source_dsa_guid;
                s->partition.source_dsa_invocation_id = s->chunk.ctr6->source_dsa_invocation_id;
@@ -447,6 +455,7 @@ static PyObject *py_net_replicate_chunk(py_net_Object *self, PyObject *args, PyO
                        }
 
                        s->chunk.req5 = pytalloc_get_ptr(py_req);
+                       exop = s->chunk.req5->extended_op;
                        break;
                case 8:
                        if (!py_check_dcerpc_type(py_req, "samba.dcerpc.drsuapi", "DsGetNCChangesRequest8")) {
@@ -454,6 +463,7 @@ static PyObject *py_net_replicate_chunk(py_net_Object *self, PyObject *args, PyO
                        }
 
                        s->chunk.req8 = pytalloc_get_ptr(py_req);
+                       exop = s->chunk.req8->extended_op;
                        break;
                case 10:
                        if (!py_check_dcerpc_type(py_req, "samba.dcerpc.drsuapi", "DsGetNCChangesRequest10")) {
@@ -461,12 +471,19 @@ static PyObject *py_net_replicate_chunk(py_net_Object *self, PyObject *args, PyO
                        }
 
                        s->chunk.req10 = pytalloc_get_ptr(py_req);
+                       exop = s->chunk.req10->extended_op;
                        break;
                default:
                        PyErr_Format(PyExc_TypeError, "Bad req_level %u in replicate_chunk", req_level);
                        return NULL;
                }
        }
+
+       if (exop != DRSUAPI_EXOP_NONE && extended_ret != DRSUAPI_EXOP_ERR_SUCCESS) {
+               PyErr_Format(PyExc_RuntimeError, "Remote EXOP %d failed with %d", exop, extended_ret);
+               return NULL;
+       }
+
        s->chunk.req_level = req_level;
 
        chunk_handler = libnet_vampire_cb_store_chunk;
@@ -482,9 +499,9 @@ static PyObject *py_net_replicate_chunk(py_net_Object *self, PyObject *args, PyO
 
        s->chunk.ctr_level = level;
 
-       status = chunk_handler(s->vampire_state, &s->chunk);
-       if (!NT_STATUS_IS_OK(status)) {
-               PyErr_Format(PyExc_TypeError, "Failed to process chunk: %s", nt_errstr(status));
+       werr = chunk_handler(s->vampire_state, &s->chunk);
+       if (!W_ERROR_IS_OK(werr)) {
+               PyErr_Format(PyExc_TypeError, "Failed to process chunk: %s", win_errstr(werr));
                return NULL;
        }