svn commit: samba r18790 - in branches/SAMBA_3_0/source:
librpc/gen_ndr librpc/idl rpc_server
jerry at samba.org
jerry at samba.org
Thu Sep 21 18:09:20 GMT 2006
Author: jerry
Date: 2006-09-21 18:09:20 +0000 (Thu, 21 Sep 2006)
New Revision: 18790
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=18790
Log:
Correct the IDL (still a bug in pidl) for QueryValue()
Modified:
branches/SAMBA_3_0/source/librpc/gen_ndr/cli_winreg.c
branches/SAMBA_3_0/source/librpc/gen_ndr/cli_winreg.h
branches/SAMBA_3_0/source/librpc/gen_ndr/ndr_winreg.c
branches/SAMBA_3_0/source/librpc/gen_ndr/srv_winreg.h
branches/SAMBA_3_0/source/librpc/gen_ndr/winreg.h
branches/SAMBA_3_0/source/librpc/idl/winreg.idl
branches/SAMBA_3_0/source/rpc_server/srv_winreg_nt.c
Changeset:
Modified: branches/SAMBA_3_0/source/librpc/gen_ndr/cli_winreg.c
===================================================================
--- branches/SAMBA_3_0/source/librpc/gen_ndr/cli_winreg.c 2006-09-21 17:51:06 UTC (rev 18789)
+++ branches/SAMBA_3_0/source/librpc/gen_ndr/cli_winreg.c 2006-09-21 18:09:20 UTC (rev 18790)
@@ -512,7 +512,7 @@
return werror_to_ntstatus(r.out.result);
}
-NTSTATUS rpccli_winreg_QueryValue(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, struct policy_handle *handle, struct winreg_String value_name, enum winreg_Type *type, uint8_t **data, uint32_t *size, uint32_t *length)
+NTSTATUS rpccli_winreg_QueryValue(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, struct policy_handle *handle, struct winreg_String value_name, enum winreg_Type *type, uint8_t *data, uint32_t *size, uint32_t *length)
{
struct winreg_QueryValue r;
NTSTATUS status;
Modified: branches/SAMBA_3_0/source/librpc/gen_ndr/cli_winreg.h
===================================================================
--- branches/SAMBA_3_0/source/librpc/gen_ndr/cli_winreg.h 2006-09-21 17:51:06 UTC (rev 18789)
+++ branches/SAMBA_3_0/source/librpc/gen_ndr/cli_winreg.h 2006-09-21 18:09:20 UTC (rev 18790)
@@ -18,7 +18,7 @@
NTSTATUS rpccli_winreg_NotifyChangeKeyValue(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, struct policy_handle *handle, uint8_t watch_subtree, uint32_t notify_filter, uint32_t unknown, struct winreg_String string1, struct winreg_String string2, uint32_t unknown2);
NTSTATUS rpccli_winreg_OpenKey(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, struct policy_handle *parent_handle, struct winreg_String keyname, uint32_t unknown, uint32_t access_mask, struct policy_handle *handle);
NTSTATUS rpccli_winreg_QueryInfoKey(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, struct policy_handle *handle, struct winreg_String class_in, struct winreg_String *class_out, uint32_t *num_subkeys, uint32_t *max_subkeylen, uint32_t *max_subkeysize, uint32_t *num_values, uint32_t *max_valnamelen, uint32_t *max_valbufsize, uint32_t *secdescsize, NTTIME *last_changed_time);
-NTSTATUS rpccli_winreg_QueryValue(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, struct policy_handle *handle, struct winreg_String value_name, enum winreg_Type *type, uint8_t **data, uint32_t *size, uint32_t *length);
+NTSTATUS rpccli_winreg_QueryValue(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, struct policy_handle *handle, struct winreg_String value_name, enum winreg_Type *type, uint8_t *data, uint32_t *size, uint32_t *length);
NTSTATUS rpccli_winreg_ReplaceKey(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx);
NTSTATUS rpccli_winreg_RestoreKey(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx);
NTSTATUS rpccli_winreg_SaveKey(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx);
Modified: branches/SAMBA_3_0/source/librpc/gen_ndr/ndr_winreg.c
===================================================================
--- branches/SAMBA_3_0/source/librpc/gen_ndr/ndr_winreg.c 2006-09-21 17:51:06 UTC (rev 18789)
+++ branches/SAMBA_3_0/source/librpc/gen_ndr/ndr_winreg.c 2006-09-21 18:09:20 UTC (rev 18790)
@@ -2272,7 +2272,6 @@
NTSTATUS ndr_push_winreg_QueryValue(struct ndr_push *ndr, int flags, const struct winreg_QueryValue *r)
{
- uint32_t cntr_data_1;
if (flags & NDR_IN) {
if (r->in.handle == NULL) return NT_STATUS_INVALID_PARAMETER_MIX;
NDR_CHECK(ndr_push_policy_handle(ndr, NDR_SCALARS|NDR_BUFFERS, r->in.handle));
@@ -2286,9 +2285,7 @@
NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, *r->in.size));
NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, 0));
NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, *r->in.length));
- for (cntr_data_1 = 0; cntr_data_1 < *r->in.length; cntr_data_1++) {
- NDR_CHECK(ndr_push_unique_ptr(ndr, r->in.data[cntr_data_1]));
- }
+ NDR_CHECK(ndr_push_array_uint8(ndr, NDR_SCALARS, r->in.data, *r->in.length));
}
NDR_CHECK(ndr_push_unique_ptr(ndr, r->in.size));
if (r->in.size) {
@@ -2309,9 +2306,7 @@
NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, *r->out.size));
NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, 0));
NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, *r->out.length));
- for (cntr_data_1 = 0; cntr_data_1 < *r->out.length; cntr_data_1++) {
- NDR_CHECK(ndr_push_unique_ptr(ndr, r->out.data[cntr_data_1]));
- }
+ NDR_CHECK(ndr_push_array_uint8(ndr, NDR_SCALARS, r->out.data, *r->out.length));
}
NDR_CHECK(ndr_push_unique_ptr(ndr, r->out.size));
if (r->out.size) {
@@ -2330,14 +2325,11 @@
{
uint32_t _ptr_type;
uint32_t _ptr_data;
- uint32_t cntr_data_1;
uint32_t _ptr_size;
uint32_t _ptr_length;
TALLOC_CTX *_mem_save_handle_0;
TALLOC_CTX *_mem_save_type_0;
TALLOC_CTX *_mem_save_data_0;
- TALLOC_CTX *_mem_save_data_1;
- TALLOC_CTX *_mem_save_data_2;
TALLOC_CTX *_mem_save_size_0;
TALLOC_CTX *_mem_save_length_0;
if (flags & NDR_IN) {
@@ -2378,17 +2370,7 @@
return ndr_pull_error(ndr, NDR_ERR_ARRAY_SIZE, "Bad array size %u should exceed array length %u", ndr_get_array_size(ndr, &r->in.data), ndr_get_array_length(ndr, &r->in.data));
}
NDR_PULL_ALLOC_N(ndr, r->in.data, ndr_get_array_size(ndr, &r->in.data));
- _mem_save_data_1 = NDR_PULL_GET_MEM_CTX(ndr);
- NDR_PULL_SET_MEM_CTX(ndr, r->in.data, 0);
- for (cntr_data_1 = 0; cntr_data_1 < *r->in.length; cntr_data_1++) {
- NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_data));
- if (_ptr_data) {
- NDR_PULL_ALLOC(ndr, r->in.data[cntr_data_1]);
- } else {
- r->in.data[cntr_data_1] = NULL;
- }
- }
- NDR_PULL_SET_MEM_CTX(ndr, _mem_save_data_1, 0);
+ NDR_CHECK(ndr_pull_array_uint8(ndr, NDR_SCALARS, r->in.data, ndr_get_array_length(ndr, &r->in.data)));
NDR_PULL_SET_MEM_CTX(ndr, _mem_save_data_0, 0);
}
NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_size));
@@ -2452,17 +2434,7 @@
return ndr_pull_error(ndr, NDR_ERR_ARRAY_SIZE, "Bad array size %u should exceed array length %u", ndr_get_array_size(ndr, &r->out.data), ndr_get_array_length(ndr, &r->out.data));
}
NDR_PULL_ALLOC_N(ndr, r->out.data, ndr_get_array_size(ndr, &r->out.data));
- _mem_save_data_1 = NDR_PULL_GET_MEM_CTX(ndr);
- NDR_PULL_SET_MEM_CTX(ndr, r->out.data, 0);
- for (cntr_data_1 = 0; cntr_data_1 < *r->out.length; cntr_data_1++) {
- NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_data));
- if (_ptr_data) {
- NDR_PULL_ALLOC(ndr, r->out.data[cntr_data_1]);
- } else {
- r->out.data[cntr_data_1] = NULL;
- }
- }
- NDR_PULL_SET_MEM_CTX(ndr, _mem_save_data_1, 0);
+ NDR_CHECK(ndr_pull_array_uint8(ndr, NDR_SCALARS, r->out.data, ndr_get_array_length(ndr, &r->out.data)));
NDR_PULL_SET_MEM_CTX(ndr, _mem_save_data_0, 0);
}
NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_size));
@@ -2504,7 +2476,6 @@
_PUBLIC_ void ndr_print_winreg_QueryValue(struct ndr_print *ndr, const char *name, int flags, const struct winreg_QueryValue *r)
{
- uint32_t cntr_data_1;
ndr_print_struct(ndr, name, "winreg_QueryValue");
ndr->depth++;
if (flags & NDR_SET_VALUES) {
@@ -2527,22 +2498,7 @@
ndr_print_ptr(ndr, "data", r->in.data);
ndr->depth++;
if (r->in.data) {
- ndr->print(ndr, "%s: ARRAY(%d)", "data", *r->in.length);
- ndr->depth++;
- for (cntr_data_1=0;cntr_data_1<*r->in.length;cntr_data_1++) {
- char *idx_1=NULL;
- asprintf(&idx_1, "[%d]", cntr_data_1);
- if (idx_1) {
- ndr_print_ptr(ndr, "data", r->in.data[cntr_data_1]);
- ndr->depth++;
- if (r->in.data[cntr_data_1]) {
- ndr_print_uint8(ndr, "data", *r->in.data[cntr_data_1]);
- }
- ndr->depth--;
- free(idx_1);
- }
- }
- ndr->depth--;
+ ndr_print_array_uint8(ndr, "data", r->in.data, *r->in.length);
}
ndr->depth--;
ndr_print_ptr(ndr, "size", r->in.size);
@@ -2571,22 +2527,7 @@
ndr_print_ptr(ndr, "data", r->out.data);
ndr->depth++;
if (r->out.data) {
- ndr->print(ndr, "%s: ARRAY(%d)", "data", *r->out.length);
- ndr->depth++;
- for (cntr_data_1=0;cntr_data_1<*r->out.length;cntr_data_1++) {
- char *idx_1=NULL;
- asprintf(&idx_1, "[%d]", cntr_data_1);
- if (idx_1) {
- ndr_print_ptr(ndr, "data", r->out.data[cntr_data_1]);
- ndr->depth++;
- if (r->out.data[cntr_data_1]) {
- ndr_print_uint8(ndr, "data", *r->out.data[cntr_data_1]);
- }
- ndr->depth--;
- free(idx_1);
- }
- }
- ndr->depth--;
+ ndr_print_array_uint8(ndr, "data", r->out.data, *r->out.length);
}
ndr->depth--;
ndr_print_ptr(ndr, "size", r->out.size);
Modified: branches/SAMBA_3_0/source/librpc/gen_ndr/srv_winreg.h
===================================================================
--- branches/SAMBA_3_0/source/librpc/gen_ndr/srv_winreg.h 2006-09-21 17:51:06 UTC (rev 18789)
+++ branches/SAMBA_3_0/source/librpc/gen_ndr/srv_winreg.h 2006-09-21 18:09:20 UTC (rev 18790)
@@ -18,7 +18,7 @@
WERROR _winreg_NotifyChangeKeyValue(pipes_struct *p, struct policy_handle *handle, uint8_t watch_subtree, uint32_t notify_filter, uint32_t unknown, struct winreg_String string1, struct winreg_String string2, uint32_t unknown2);
WERROR _winreg_OpenKey(pipes_struct *p, struct policy_handle *parent_handle, struct winreg_String keyname, uint32_t unknown, uint32_t access_mask, struct policy_handle *handle);
WERROR _winreg_QueryInfoKey(pipes_struct *p, struct policy_handle *handle, struct winreg_String class_in, struct winreg_String *class_out, uint32_t *num_subkeys, uint32_t *max_subkeylen, uint32_t *max_subkeysize, uint32_t *num_values, uint32_t *max_valnamelen, uint32_t *max_valbufsize, uint32_t *secdescsize, NTTIME *last_changed_time);
-WERROR _winreg_QueryValue(pipes_struct *p, struct policy_handle *handle, struct winreg_String value_name, enum winreg_Type *type, uint8_t **data, uint32_t *size, uint32_t *length);
+WERROR _winreg_QueryValue(pipes_struct *p, struct policy_handle *handle, struct winreg_String value_name, enum winreg_Type *type, uint8_t *data, uint32_t *size, uint32_t *length);
WERROR _winreg_ReplaceKey(pipes_struct *p);
WERROR _winreg_RestoreKey(pipes_struct *p);
WERROR _winreg_SaveKey(pipes_struct *p);
Modified: branches/SAMBA_3_0/source/librpc/gen_ndr/winreg.h
===================================================================
--- branches/SAMBA_3_0/source/librpc/gen_ndr/winreg.h 2006-09-21 17:51:06 UTC (rev 18789)
+++ branches/SAMBA_3_0/source/librpc/gen_ndr/winreg.h 2006-09-21 18:09:20 UTC (rev 18790)
@@ -334,14 +334,14 @@
struct policy_handle *handle;/* [ref] */
struct winreg_String value_name;
enum winreg_Type *type;/* [unique] */
- uint8_t **data;/* [unique,length_is(*length),size_is(*size)] */
+ uint8_t *data;/* [unique,length_is(*length),size_is(*size)] */
uint32_t *size;/* [unique] */
uint32_t *length;/* [unique] */
} in;
struct {
enum winreg_Type *type;/* [unique] */
- uint8_t **data;/* [unique,length_is(*length),size_is(*size)] */
+ uint8_t *data;/* [unique,length_is(*length),size_is(*size)] */
uint32_t *size;/* [unique] */
uint32_t *length;/* [unique] */
WERROR result;
Modified: branches/SAMBA_3_0/source/librpc/idl/winreg.idl
===================================================================
--- branches/SAMBA_3_0/source/librpc/idl/winreg.idl 2006-09-21 17:51:06 UTC (rev 18789)
+++ branches/SAMBA_3_0/source/librpc/idl/winreg.idl 2006-09-21 18:09:20 UTC (rev 18790)
@@ -226,7 +226,7 @@
[in,ref] policy_handle *handle,
[in] winreg_String value_name,
[in,out] winreg_Type *type,
- [in,out,size_is(*size),length_is(*length)] uint8 **data,
+ [in,out,size_is(*size),length_is(*length)] uint8 *data,
[in,out] uint32 *size,
[in,out] uint32 *length
);
Modified: branches/SAMBA_3_0/source/rpc_server/srv_winreg_nt.c
===================================================================
--- branches/SAMBA_3_0/source/rpc_server/srv_winreg_nt.c 2006-09-21 17:51:06 UTC (rev 18789)
+++ branches/SAMBA_3_0/source/rpc_server/srv_winreg_nt.c 2006-09-21 18:09:20 UTC (rev 18790)
@@ -350,7 +350,7 @@
reg_reply_info
********************************************************************/
-WERROR _winreg_QueryValue(pipes_struct *p, struct policy_handle *handle, struct winreg_String value_name, enum winreg_Type *type, uint8_t **data, uint32_t *size, uint32_t *length)
+WERROR _winreg_QueryValue(pipes_struct *p, struct policy_handle *handle, struct winreg_String value_name, enum winreg_Type *type, uint8_t *data, uint32_t *size, uint32_t *length)
{
WERROR status = WERR_BADFILE;
char *name;
@@ -470,9 +470,11 @@
*size = regval_size( val );
*length = regval_size( val );
+#if 0
if ( (*data = talloc_memdup( p->mem_ctx, regval_data_p(val), *size )) == NULL ) {
status = WERR_NOMEM;
}
+#endif
*type = val->type;
}
More information about the samba-cvs
mailing list