summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--source3/librpc/gen_ndr/cli_winreg.c10
-rw-r--r--source3/librpc/gen_ndr/cli_winreg.h4
-rw-r--r--source3/librpc/gen_ndr/ndr_winreg.c89
-rw-r--r--source3/librpc/gen_ndr/srv_winreg.c2
-rw-r--r--source3/librpc/gen_ndr/winreg.h9
5 files changed, 56 insertions, 58 deletions
diff --git a/source3/librpc/gen_ndr/cli_winreg.c b/source3/librpc/gen_ndr/cli_winreg.c
index c0a0bd8f14..9ad1a47a25 100644
--- a/source3/librpc/gen_ndr/cli_winreg.c
+++ b/source3/librpc/gen_ndr/cli_winreg.c
@@ -872,9 +872,9 @@ NTSTATUS rpccli_winreg_QueryValue(struct rpc_pipe_client *cli,
struct policy_handle *handle /* [in] [ref] */,
struct winreg_String *value_name /* [in] [ref] */,
enum winreg_Type *type /* [in,out] [unique] */,
- uint8_t *data /* [in,out] [unique,length_is(*value_length),size_is(*data_size)] */,
+ uint8_t *data /* [in,out] [unique,length_is(*data_length),size_is(*data_size)] */,
uint32_t *data_size /* [in,out] [unique] */,
- uint32_t *value_length /* [in,out] [unique] */,
+ uint32_t *data_length /* [in,out] [unique] */,
WERROR *werror)
{
struct winreg_QueryValue r;
@@ -886,7 +886,7 @@ NTSTATUS rpccli_winreg_QueryValue(struct rpc_pipe_client *cli,
r.in.type = type;
r.in.data = data;
r.in.data_size = data_size;
- r.in.value_length = value_length;
+ r.in.data_length = data_length;
if (DEBUGLEVEL >= 10) {
NDR_PRINT_IN_DEBUG(winreg_QueryValue, &r);
@@ -920,8 +920,8 @@ NTSTATUS rpccli_winreg_QueryValue(struct rpc_pipe_client *cli,
if (data_size && r.out.data_size) {
*data_size = *r.out.data_size;
}
- if (value_length && r.out.value_length) {
- *value_length = *r.out.value_length;
+ if (data_length && r.out.data_length) {
+ *data_length = *r.out.data_length;
}
/* Return result */
diff --git a/source3/librpc/gen_ndr/cli_winreg.h b/source3/librpc/gen_ndr/cli_winreg.h
index a8a617ce2c..8ce043c746 100644
--- a/source3/librpc/gen_ndr/cli_winreg.h
+++ b/source3/librpc/gen_ndr/cli_winreg.h
@@ -126,9 +126,9 @@ NTSTATUS rpccli_winreg_QueryValue(struct rpc_pipe_client *cli,
struct policy_handle *handle /* [in] [ref] */,
struct winreg_String *value_name /* [in] [ref] */,
enum winreg_Type *type /* [in,out] [unique] */,
- uint8_t *data /* [in,out] [unique,length_is(*value_length),size_is(*data_size)] */,
+ uint8_t *data /* [in,out] [unique,length_is(*data_length),size_is(*data_size)] */,
uint32_t *data_size /* [in,out] [unique] */,
- uint32_t *value_length /* [in,out] [unique] */,
+ uint32_t *data_length /* [in,out] [unique] */,
WERROR *werror);
NTSTATUS rpccli_winreg_ReplaceKey(struct rpc_pipe_client *cli,
TALLOC_CTX *mem_ctx,
diff --git a/source3/librpc/gen_ndr/ndr_winreg.c b/source3/librpc/gen_ndr/ndr_winreg.c
index 8fed96867b..818ce65936 100644
--- a/source3/librpc/gen_ndr/ndr_winreg.c
+++ b/source3/librpc/gen_ndr/ndr_winreg.c
@@ -4,7 +4,6 @@
#include "librpc/gen_ndr/ndr_winreg.h"
#include "librpc/gen_ndr/ndr_lsa.h"
-#include "librpc/gen_ndr/ndr_initshutdown.h"
#include "librpc/gen_ndr/ndr_security.h"
static enum ndr_err_code ndr_push_winreg_AccessMask(struct ndr_push *ndr, int ndr_flags, uint32_t r)
{
@@ -2507,16 +2506,16 @@ _PUBLIC_ enum ndr_err_code ndr_push_winreg_QueryValue(struct ndr_push *ndr, int
if (r->in.data) {
NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, *r->in.data_size));
NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, 0));
- NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, *r->in.value_length));
- NDR_CHECK(ndr_push_array_uint8(ndr, NDR_SCALARS, r->in.data, *r->in.value_length));
+ NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, *r->in.data_length));
+ NDR_CHECK(ndr_push_array_uint8(ndr, NDR_SCALARS, r->in.data, *r->in.data_length));
}
NDR_CHECK(ndr_push_unique_ptr(ndr, r->in.data_size));
if (r->in.data_size) {
NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, *r->in.data_size));
}
- NDR_CHECK(ndr_push_unique_ptr(ndr, r->in.value_length));
- if (r->in.value_length) {
- NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, *r->in.value_length));
+ NDR_CHECK(ndr_push_unique_ptr(ndr, r->in.data_length));
+ if (r->in.data_length) {
+ NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, *r->in.data_length));
}
}
if (flags & NDR_OUT) {
@@ -2528,16 +2527,16 @@ _PUBLIC_ enum ndr_err_code ndr_push_winreg_QueryValue(struct ndr_push *ndr, int
if (r->out.data) {
NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, *r->out.data_size));
NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, 0));
- NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, *r->out.value_length));
- NDR_CHECK(ndr_push_array_uint8(ndr, NDR_SCALARS, r->out.data, *r->out.value_length));
+ NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, *r->out.data_length));
+ NDR_CHECK(ndr_push_array_uint8(ndr, NDR_SCALARS, r->out.data, *r->out.data_length));
}
NDR_CHECK(ndr_push_unique_ptr(ndr, r->out.data_size));
if (r->out.data_size) {
NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, *r->out.data_size));
}
- NDR_CHECK(ndr_push_unique_ptr(ndr, r->out.value_length));
- if (r->out.value_length) {
- NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, *r->out.value_length));
+ NDR_CHECK(ndr_push_unique_ptr(ndr, r->out.data_length));
+ if (r->out.data_length) {
+ NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, *r->out.data_length));
}
NDR_CHECK(ndr_push_WERROR(ndr, NDR_SCALARS, r->out.result));
}
@@ -2549,13 +2548,13 @@ _PUBLIC_ enum ndr_err_code ndr_pull_winreg_QueryValue(struct ndr_pull *ndr, int
uint32_t _ptr_type;
uint32_t _ptr_data;
uint32_t _ptr_data_size;
- uint32_t _ptr_value_length;
+ uint32_t _ptr_data_length;
TALLOC_CTX *_mem_save_handle_0;
TALLOC_CTX *_mem_save_value_name_0;
TALLOC_CTX *_mem_save_type_0;
TALLOC_CTX *_mem_save_data_0;
TALLOC_CTX *_mem_save_data_size_0;
- TALLOC_CTX *_mem_save_value_length_0;
+ TALLOC_CTX *_mem_save_data_length_0;
if (flags & NDR_IN) {
ZERO_STRUCT(r->out);
@@ -2615,25 +2614,25 @@ _PUBLIC_ enum ndr_err_code ndr_pull_winreg_QueryValue(struct ndr_pull *ndr, int
NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, r->in.data_size));
NDR_PULL_SET_MEM_CTX(ndr, _mem_save_data_size_0, 0);
}
- NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_value_length));
- if (_ptr_value_length) {
- NDR_PULL_ALLOC(ndr, r->in.value_length);
+ NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_data_length));
+ if (_ptr_data_length) {
+ NDR_PULL_ALLOC(ndr, r->in.data_length);
} else {
- r->in.value_length = NULL;
+ r->in.data_length = NULL;
}
- if (r->in.value_length) {
- _mem_save_value_length_0 = NDR_PULL_GET_MEM_CTX(ndr);
- NDR_PULL_SET_MEM_CTX(ndr, r->in.value_length, 0);
- NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, r->in.value_length));
- NDR_PULL_SET_MEM_CTX(ndr, _mem_save_value_length_0, 0);
+ if (r->in.data_length) {
+ _mem_save_data_length_0 = NDR_PULL_GET_MEM_CTX(ndr);
+ NDR_PULL_SET_MEM_CTX(ndr, r->in.data_length, 0);
+ NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, r->in.data_length));
+ NDR_PULL_SET_MEM_CTX(ndr, _mem_save_data_length_0, 0);
}
if (r->in.data) {
if (r->in.data_size == NULL) return ndr_pull_error(ndr, NDR_ERR_INVALID_POINTER, "NULL Pointer for size_is()");
NDR_CHECK(ndr_check_array_size(ndr, (void*)&r->in.data, *r->in.data_size));
}
if (r->in.data) {
- if (r->in.value_length == NULL) return ndr_pull_error(ndr, NDR_ERR_INVALID_POINTER, "NULL Pointer for length_is()");
- NDR_CHECK(ndr_check_array_length(ndr, (void*)&r->in.data, *r->in.value_length));
+ if (r->in.data_length == NULL) return ndr_pull_error(ndr, NDR_ERR_INVALID_POINTER, "NULL Pointer for length_is()");
+ NDR_CHECK(ndr_check_array_length(ndr, (void*)&r->in.data, *r->in.data_length));
}
}
if (flags & NDR_OUT) {
@@ -2679,17 +2678,17 @@ _PUBLIC_ enum ndr_err_code ndr_pull_winreg_QueryValue(struct ndr_pull *ndr, int
NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, r->out.data_size));
NDR_PULL_SET_MEM_CTX(ndr, _mem_save_data_size_0, 0);
}
- NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_value_length));
- if (_ptr_value_length) {
- NDR_PULL_ALLOC(ndr, r->out.value_length);
+ NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_data_length));
+ if (_ptr_data_length) {
+ NDR_PULL_ALLOC(ndr, r->out.data_length);
} else {
- r->out.value_length = NULL;
+ r->out.data_length = NULL;
}
- if (r->out.value_length) {
- _mem_save_value_length_0 = NDR_PULL_GET_MEM_CTX(ndr);
- NDR_PULL_SET_MEM_CTX(ndr, r->out.value_length, 0);
- NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, r->out.value_length));
- NDR_PULL_SET_MEM_CTX(ndr, _mem_save_value_length_0, 0);
+ if (r->out.data_length) {
+ _mem_save_data_length_0 = NDR_PULL_GET_MEM_CTX(ndr);
+ NDR_PULL_SET_MEM_CTX(ndr, r->out.data_length, 0);
+ NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, r->out.data_length));
+ NDR_PULL_SET_MEM_CTX(ndr, _mem_save_data_length_0, 0);
}
NDR_CHECK(ndr_pull_WERROR(ndr, NDR_SCALARS, &r->out.result));
if (r->out.data) {
@@ -2697,8 +2696,8 @@ _PUBLIC_ enum ndr_err_code ndr_pull_winreg_QueryValue(struct ndr_pull *ndr, int
NDR_CHECK(ndr_check_array_size(ndr, (void*)&r->out.data, *r->out.data_size));
}
if (r->out.data) {
- if (r->out.value_length == NULL) return ndr_pull_error(ndr, NDR_ERR_INVALID_POINTER, "NULL Pointer for length_is()");
- NDR_CHECK(ndr_check_array_length(ndr, (void*)&r->out.data, *r->out.value_length));
+ if (r->out.data_length == NULL) return ndr_pull_error(ndr, NDR_ERR_INVALID_POINTER, "NULL Pointer for length_is()");
+ NDR_CHECK(ndr_check_array_length(ndr, (void*)&r->out.data, *r->out.data_length));
}
}
return NDR_ERR_SUCCESS;
@@ -2731,8 +2730,8 @@ _PUBLIC_ void ndr_print_winreg_QueryValue(struct ndr_print *ndr, const char *nam
ndr_print_ptr(ndr, "data", r->in.data);
ndr->depth++;
if (r->in.data) {
- if (r->in.value_length == NULL) return;
- ndr_print_array_uint8(ndr, "data", r->in.data, *r->in.value_length);
+ if (r->in.data_length == NULL) return;
+ ndr_print_array_uint8(ndr, "data", r->in.data, *r->in.data_length);
}
ndr->depth--;
ndr_print_ptr(ndr, "data_size", r->in.data_size);
@@ -2741,10 +2740,10 @@ _PUBLIC_ void ndr_print_winreg_QueryValue(struct ndr_print *ndr, const char *nam
ndr_print_uint32(ndr, "data_size", *r->in.data_size);
}
ndr->depth--;
- ndr_print_ptr(ndr, "value_length", r->in.value_length);
+ ndr_print_ptr(ndr, "data_length", r->in.data_length);
ndr->depth++;
- if (r->in.value_length) {
- ndr_print_uint32(ndr, "value_length", *r->in.value_length);
+ if (r->in.data_length) {
+ ndr_print_uint32(ndr, "data_length", *r->in.data_length);
}
ndr->depth--;
ndr->depth--;
@@ -2761,8 +2760,8 @@ _PUBLIC_ void ndr_print_winreg_QueryValue(struct ndr_print *ndr, const char *nam
ndr_print_ptr(ndr, "data", r->out.data);
ndr->depth++;
if (r->out.data) {
- if (r->out.value_length == NULL) return;
- ndr_print_array_uint8(ndr, "data", r->out.data, *r->out.value_length);
+ if (r->out.data_length == NULL) return;
+ ndr_print_array_uint8(ndr, "data", r->out.data, *r->out.data_length);
}
ndr->depth--;
ndr_print_ptr(ndr, "data_size", r->out.data_size);
@@ -2771,10 +2770,10 @@ _PUBLIC_ void ndr_print_winreg_QueryValue(struct ndr_print *ndr, const char *nam
ndr_print_uint32(ndr, "data_size", *r->out.data_size);
}
ndr->depth--;
- ndr_print_ptr(ndr, "value_length", r->out.value_length);
+ ndr_print_ptr(ndr, "data_length", r->out.data_length);
ndr->depth++;
- if (r->out.value_length) {
- ndr_print_uint32(ndr, "value_length", *r->out.value_length);
+ if (r->out.data_length) {
+ ndr_print_uint32(ndr, "data_length", *r->out.data_length);
}
ndr->depth--;
ndr_print_WERROR(ndr, "result", r->out.result);
diff --git a/source3/librpc/gen_ndr/srv_winreg.c b/source3/librpc/gen_ndr/srv_winreg.c
index 3b7e195e3b..77b0a1c5d2 100644
--- a/source3/librpc/gen_ndr/srv_winreg.c
+++ b/source3/librpc/gen_ndr/srv_winreg.c
@@ -1403,7 +1403,7 @@ static bool api_winreg_QueryValue(pipes_struct *p)
r->out.type = r->in.type;
r->out.data = r->in.data;
r->out.data_size = r->in.data_size;
- r->out.value_length = r->in.value_length;
+ r->out.data_length = r->in.data_length;
r->out.result = _winreg_QueryValue(p, r);
if (p->rng_fault_state) {
diff --git a/source3/librpc/gen_ndr/winreg.h b/source3/librpc/gen_ndr/winreg.h
index aa039df484..ddcb363d3d 100644
--- a/source3/librpc/gen_ndr/winreg.h
+++ b/source3/librpc/gen_ndr/winreg.h
@@ -3,7 +3,6 @@
#include <stdint.h>
#include "librpc/gen_ndr/lsa.h"
-#include "librpc/gen_ndr/initshutdown.h"
#include "librpc/gen_ndr/security.h"
#ifndef _HEADER_winreg
#define _HEADER_winreg
@@ -389,16 +388,16 @@ struct winreg_QueryValue {
struct policy_handle *handle;/* [ref] */
struct winreg_String *value_name;/* [ref] */
enum winreg_Type *type;/* [unique] */
- uint8_t *data;/* [unique,length_is(*value_length),size_is(*data_size)] */
+ uint8_t *data;/* [unique,length_is(*data_length),size_is(*data_size)] */
uint32_t *data_size;/* [unique] */
- uint32_t *value_length;/* [unique] */
+ uint32_t *data_length;/* [unique] */
} in;
struct {
enum winreg_Type *type;/* [unique] */
- uint8_t *data;/* [unique,length_is(*value_length),size_is(*data_size)] */
+ uint8_t *data;/* [unique,length_is(*data_length),size_is(*data_size)] */
uint32_t *data_size;/* [unique] */
- uint32_t *value_length;/* [unique] */
+ uint32_t *data_length;/* [unique] */
WERROR result;
} out;
generated by cgit (git 2.34.1) at 2024-11-27 12:28:40 +0000