Author: metze Date: 2006-07-17 09:48:06 +0000 (Mon, 17 Jul 2006) New Revision: 17085
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=17085 Log: reuse the existing sec_desc_buf struct metze Modified: branches/SAMBA_4_0/source/librpc/idl/srvsvc.idl branches/SAMBA_4_0/source/torture/rpc/samba3rpc.c Changeset: Modified: branches/SAMBA_4_0/source/librpc/idl/srvsvc.idl =================================================================== --- branches/SAMBA_4_0/source/librpc/idl/srvsvc.idl 2006-07-17 09:44:13 UTC (rev 17084) +++ branches/SAMBA_4_0/source/librpc/idl/srvsvc.idl 2006-07-17 09:48:06 UTC (rev 17085) @@ -455,6 +455,7 @@ uint32 current_users; [string,charset(UTF16)] uint16 *path; [string,charset(UTF16)] uint16 *password; + /* maybe here is a struct sec_desc_buf following */ uint32 unknown; [subcontext(4)] security_descriptor *sd; } srvsvc_NetShareInfo502; @@ -502,13 +503,8 @@ } srvsvc_NetShareCtr1007; typedef struct { - [range(0,0x40000),value(ndr_size_security_descriptor(sd,ndr->flags))] uint32 sd_size; - [subcontext(4)] security_descriptor *sd; - } srvsvc_NetShareInfo1501; - - typedef struct { uint32 count; - [size_is(count)] srvsvc_NetShareInfo1501 *array; + [size_is(count)] sec_desc_buf *array; } srvsvc_NetShareCtr1501; typedef union { @@ -521,7 +517,7 @@ [case(1005)] srvsvc_NetShareInfo1005 *info1005; [case(1006)] srvsvc_NetShareInfo1006 *info1006; [case(1007)] srvsvc_NetShareInfo1007 *info1007; - [case(1501)] srvsvc_NetShareInfo1501 *info1501; + [case(1501)] sec_desc_buf *info1501; [default] ; } srvsvc_NetShareInfo; Modified: branches/SAMBA_4_0/source/torture/rpc/samba3rpc.c =================================================================== --- branches/SAMBA_4_0/source/torture/rpc/samba3rpc.c 2006-07-17 09:44:13 UTC (rev 17084) +++ branches/SAMBA_4_0/source/torture/rpc/samba3rpc.c 2006-07-17 09:48:06 UTC (rev 17085) @@ -1891,7 +1891,7 @@ TALLOC_CTX *tmp_ctx; struct dcerpc_pipe *p; NTSTATUS status; - struct srvsvc_NetShareInfo1501 i; + struct sec_desc_buf i; struct srvsvc_NetShareSetInfo r; uint32_t error = 0;