diff options
| author | Kamen Mazdrashki <kamen.mazdrashki@postpath.com> | 2010-03-10 16:37:38 +0200 |
|---|---|---|
| committer | Kamen Mazdrashki <kamen.mazdrashki@postpath.com> | 2010-03-24 17:34:37 +0200 |
| commit | 00fce797e889eb7b9d8310e18d5264cad5403dd2 (patch) | |
| tree | 8bdd7eba75a1aeaa019e652be3138c8220328394 | |
| parent | 7b4341637cdd9e4797303197e8c2e1e405ab20e1 (diff) | |
| download | samba-00fce797e889eb7b9d8310e18d5264cad5403dd2.tar.gz samba-00fce797e889eb7b9d8310e18d5264cad5403dd2.tar.bz2 samba-00fce797e889eb7b9d8310e18d5264cad5403dd2.zip | |
s4/drs: drsuapi_DsAddEntry_ErrData propagate structure def in source code
| -rw-r--r-- | source4/libnet/libnet_become_dc.c | 14 | ||||
| -rw-r--r-- | source4/rpc_server/drsuapi/addentry.c | 8 |
2 files changed, 11 insertions, 11 deletions
diff --git a/source4/libnet/libnet_become_dc.c b/source4/libnet/libnet_become_dc.c index ccfb012d6f..f518349114 100644 --- a/source4/libnet/libnet_become_dc.c +++ b/source4/libnet/libnet_become_dc.c @@ -2288,33 +2288,33 @@ static void becomeDC_drsuapi1_add_entry_recv(struct tevent_req *subreq) if (r->out.ctr->ctr3.count != 1) { WERROR status; - if (r->out.ctr->ctr3.level != 1) { + if (r->out.ctr->ctr3.err_ver != 1) { composite_error(c, NT_STATUS_INVALID_NETWORK_RESPONSE); return; } - if (!r->out.ctr->ctr3.error) { + if (!r->out.ctr->ctr3.err_data) { composite_error(c, NT_STATUS_INVALID_NETWORK_RESPONSE); return; } - status = r->out.ctr->ctr3.error->info1.status; + status = r->out.ctr->ctr3.err_data->v1.status; - if (!r->out.ctr->ctr3.error->info1.info) { + if (!r->out.ctr->ctr3.err_data->v1.info) { composite_error(c, werror_to_ntstatus(status)); return; } /* see if we can get a more detailed error */ - switch (r->out.ctr->ctr3.error->info1.level) { + switch (r->out.ctr->ctr3.err_data->v1.dir_err) { case 1: - status = r->out.ctr->ctr3.error->info1.info->error1.status; + status = r->out.ctr->ctr3.err_data->v1.info->error1.status; break; case 4: case 5: case 6: case 7: - status = r->out.ctr->ctr3.error->info1.info->errorX.extended_err; + status = r->out.ctr->ctr3.err_data->v1.info->errorX.extended_err; break; } diff --git a/source4/rpc_server/drsuapi/addentry.c b/source4/rpc_server/drsuapi/addentry.c index b9d04c20f5..cfddd80fe4 100644 --- a/source4/rpc_server/drsuapi/addentry.c +++ b/source4/rpc_server/drsuapi/addentry.c @@ -165,8 +165,8 @@ WERROR dcesrv_drsuapi_DsAddEntry(struct dcesrv_call_state *dce_call, TALLOC_CTX ZERO_STRUCTP(r->out.ctr); *r->out.level_out = 3; - r->out.ctr->ctr3.level = 1; - r->out.ctr->ctr3.error = talloc_zero(mem_ctx, union drsuapi_DsAddEntryError); + r->out.ctr->ctr3.err_ver = 1; + r->out.ctr->ctr3.err_data = talloc_zero(mem_ctx, union drsuapi_DsAddEntry_ErrData); DCESRV_PULL_HANDLE_WERR(h, r->in.bind_handle, DRSUAPI_BIND_HANDLE); b_state = h->data; @@ -192,7 +192,7 @@ WERROR dcesrv_drsuapi_DsAddEntry(struct dcesrv_call_state *dce_call, TALLOC_CTX &num, &ids); if (!W_ERROR_IS_OK(status)) { - r->out.ctr->ctr3.error->info1.status = status; + r->out.ctr->ctr3.err_data->v1.status = status; ldb_transaction_cancel(b_state->sam_ctx); DEBUG(0,(__location__ ": DsAddEntry failed - %s\n", win_errstr(status))); return status; @@ -211,7 +211,7 @@ WERROR dcesrv_drsuapi_DsAddEntry(struct dcesrv_call_state *dce_call, TALLOC_CTX */ status = drsuapi_add_SPNs(b_state, dce_call, mem_ctx, first_object); if (!W_ERROR_IS_OK(status)) { - r->out.ctr->ctr3.error->info1.status = status; + r->out.ctr->ctr3.err_data->v1.status = status; ldb_transaction_cancel(b_state->sam_ctx); DEBUG(0,(__location__ ": DsAddEntry add SPNs failed - %s\n", win_errstr(status))); return status; |