summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--source3/librpc/gen_ndr/lsa.h2
-rw-r--r--source3/librpc/gen_ndr/ndr_lsa.c76
2 files changed, 39 insertions, 39 deletions
diff --git a/source3/librpc/gen_ndr/lsa.h b/source3/librpc/gen_ndr/lsa.h
index 4285a5730e..7686bec336 100644
--- a/source3/librpc/gen_ndr/lsa.h
+++ b/source3/librpc/gen_ndr/lsa.h
@@ -43,7 +43,7 @@ struct lsa_AsciiStringLarge {
struct lsa_BinaryString {
uint16_t length;
uint16_t size;
- uint16_t *string;/* [unique,length_is(length/2),size_is(size/2)] */
+ uint16_t *array;/* [unique,length_is(length/2),size_is(size/2)] */
}/* [public] */;
struct lsa_LUID {
diff --git a/source3/librpc/gen_ndr/ndr_lsa.c b/source3/librpc/gen_ndr/ndr_lsa.c
index d881093272..1aa055e901 100644
--- a/source3/librpc/gen_ndr/ndr_lsa.c
+++ b/source3/librpc/gen_ndr/ndr_lsa.c
@@ -376,20 +376,20 @@ _PUBLIC_ void ndr_print_lsa_AsciiStringLarge(struct ndr_print *ndr, const char *
_PUBLIC_ enum ndr_err_code ndr_push_lsa_BinaryString(struct ndr_push *ndr, int ndr_flags, const struct lsa_BinaryString *r)
{
- uint32_t cntr_string_1;
+ uint32_t cntr_array_1;
if (ndr_flags & NDR_SCALARS) {
NDR_CHECK(ndr_push_align(ndr, 4));
NDR_CHECK(ndr_push_uint16(ndr, NDR_SCALARS, r->length));
NDR_CHECK(ndr_push_uint16(ndr, NDR_SCALARS, r->size));
- NDR_CHECK(ndr_push_unique_ptr(ndr, r->string));
+ NDR_CHECK(ndr_push_unique_ptr(ndr, r->array));
}
if (ndr_flags & NDR_BUFFERS) {
- if (r->string) {
+ if (r->array) {
NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->size / 2));
NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, 0));
NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->length / 2));
- for (cntr_string_1 = 0; cntr_string_1 < r->length / 2; cntr_string_1++) {
- NDR_CHECK(ndr_push_uint16(ndr, NDR_SCALARS, r->string[cntr_string_1]));
+ for (cntr_array_1 = 0; cntr_array_1 < r->length / 2; cntr_array_1++) {
+ NDR_CHECK(ndr_push_uint16(ndr, NDR_SCALARS, r->array[cntr_array_1]));
}
}
}
@@ -398,44 +398,44 @@ _PUBLIC_ enum ndr_err_code ndr_push_lsa_BinaryString(struct ndr_push *ndr, int n
_PUBLIC_ enum ndr_err_code ndr_pull_lsa_BinaryString(struct ndr_pull *ndr, int ndr_flags, struct lsa_BinaryString *r)
{
- uint32_t _ptr_string;
- uint32_t cntr_string_1;
- TALLOC_CTX *_mem_save_string_0;
- TALLOC_CTX *_mem_save_string_1;
+ uint32_t _ptr_array;
+ uint32_t cntr_array_1;
+ TALLOC_CTX *_mem_save_array_0;
+ TALLOC_CTX *_mem_save_array_1;
if (ndr_flags & NDR_SCALARS) {
NDR_CHECK(ndr_pull_align(ndr, 4));
NDR_CHECK(ndr_pull_uint16(ndr, NDR_SCALARS, &r->length));
NDR_CHECK(ndr_pull_uint16(ndr, NDR_SCALARS, &r->size));
- NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_string));
- if (_ptr_string) {
- NDR_PULL_ALLOC(ndr, r->string);
+ NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_array));
+ if (_ptr_array) {
+ NDR_PULL_ALLOC(ndr, r->array);
} else {
- r->string = NULL;
+ r->array = NULL;
}
}
if (ndr_flags & NDR_BUFFERS) {
- if (r->string) {
- _mem_save_string_0 = NDR_PULL_GET_MEM_CTX(ndr);
- NDR_PULL_SET_MEM_CTX(ndr, r->string, 0);
- NDR_CHECK(ndr_pull_array_size(ndr, &r->string));
- NDR_CHECK(ndr_pull_array_length(ndr, &r->string));
- if (ndr_get_array_length(ndr, &r->string) > ndr_get_array_size(ndr, &r->string)) {
- return ndr_pull_error(ndr, NDR_ERR_ARRAY_SIZE, "Bad array size %u should exceed array length %u", ndr_get_array_size(ndr, &r->string), ndr_get_array_length(ndr, &r->string));
+ if (r->array) {
+ _mem_save_array_0 = NDR_PULL_GET_MEM_CTX(ndr);
+ NDR_PULL_SET_MEM_CTX(ndr, r->array, 0);
+ NDR_CHECK(ndr_pull_array_size(ndr, &r->array));
+ NDR_CHECK(ndr_pull_array_length(ndr, &r->array));
+ if (ndr_get_array_length(ndr, &r->array) > ndr_get_array_size(ndr, &r->array)) {
+ return ndr_pull_error(ndr, NDR_ERR_ARRAY_SIZE, "Bad array size %u should exceed array length %u", ndr_get_array_size(ndr, &r->array), ndr_get_array_length(ndr, &r->array));
}
- NDR_PULL_ALLOC_N(ndr, r->string, ndr_get_array_size(ndr, &r->string));
- _mem_save_string_1 = NDR_PULL_GET_MEM_CTX(ndr);
- NDR_PULL_SET_MEM_CTX(ndr, r->string, 0);
- for (cntr_string_1 = 0; cntr_string_1 < r->length / 2; cntr_string_1++) {
- NDR_CHECK(ndr_pull_uint16(ndr, NDR_SCALARS, &r->string[cntr_string_1]));
+ NDR_PULL_ALLOC_N(ndr, r->array, ndr_get_array_size(ndr, &r->array));
+ _mem_save_array_1 = NDR_PULL_GET_MEM_CTX(ndr);
+ NDR_PULL_SET_MEM_CTX(ndr, r->array, 0);
+ for (cntr_array_1 = 0; cntr_array_1 < r->length / 2; cntr_array_1++) {
+ NDR_CHECK(ndr_pull_uint16(ndr, NDR_SCALARS, &r->array[cntr_array_1]));
}
- NDR_PULL_SET_MEM_CTX(ndr, _mem_save_string_1, 0);
- NDR_PULL_SET_MEM_CTX(ndr, _mem_save_string_0, 0);
+ NDR_PULL_SET_MEM_CTX(ndr, _mem_save_array_1, 0);
+ NDR_PULL_SET_MEM_CTX(ndr, _mem_save_array_0, 0);
}
- if (r->string) {
- NDR_CHECK(ndr_check_array_size(ndr, (void*)&r->string, r->size / 2));
+ if (r->array) {
+ NDR_CHECK(ndr_check_array_size(ndr, (void*)&r->array, r->size / 2));
}
- if (r->string) {
- NDR_CHECK(ndr_check_array_length(ndr, (void*)&r->string, r->length / 2));
+ if (r->array) {
+ NDR_CHECK(ndr_check_array_length(ndr, (void*)&r->array, r->length / 2));
}
}
return NDR_ERR_SUCCESS;
@@ -443,20 +443,20 @@ _PUBLIC_ enum ndr_err_code ndr_pull_lsa_BinaryString(struct ndr_pull *ndr, int n
_PUBLIC_ void ndr_print_lsa_BinaryString(struct ndr_print *ndr, const char *name, const struct lsa_BinaryString *r)
{
- uint32_t cntr_string_1;
+ uint32_t cntr_array_1;
ndr_print_struct(ndr, name, "lsa_BinaryString");
ndr->depth++;
ndr_print_uint16(ndr, "length", r->length);
ndr_print_uint16(ndr, "size", r->size);
- ndr_print_ptr(ndr, "string", r->string);
+ ndr_print_ptr(ndr, "array", r->array);
ndr->depth++;
- if (r->string) {
- ndr->print(ndr, "%s: ARRAY(%d)", "string", r->length / 2);
+ if (r->array) {
+ ndr->print(ndr, "%s: ARRAY(%d)", "array", r->length / 2);
ndr->depth++;
- for (cntr_string_1=0;cntr_string_1<r->length / 2;cntr_string_1++) {
+ for (cntr_array_1=0;cntr_array_1<r->length / 2;cntr_array_1++) {
char *idx_1=NULL;
- if (asprintf(&idx_1, "[%d]", cntr_string_1) != -1) {
- ndr_print_uint16(ndr, "string", r->string[cntr_string_1]);
+ if (asprintf(&idx_1, "[%d]", cntr_array_1) != -1) {
+ ndr_print_uint16(ndr, "array", r->array[cntr_array_1]);
free(idx_1);
}
}
generated by cgit (git 2.34.1) at 2024-12-12 18:23:39 +0000