r17085: reuse the existing sec_desc_buf struct

metze
(This used to be commit 22463cbcdd159657d04657071451738e768d0b2a)

diff --git a/source4/librpc/idl/srvsvc.idl b/source4/librpc/idl/srvsvc.idl
index de41b23ce553ab3389c5146475e04bdd088621fe..f253178d9a58578e6af1bb6068bec4c2f8526b35 100644 (file)
--- a/source4/librpc/idl/srvsvc.idl
+++ b/source4/librpc/idl/srvsvc.idl
@@ -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;
@@ -501,14 +502,9 @@
                [size_is(count)] srvsvc_NetShareInfo1007 *array;
        } 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;
 

diff --git a/source4/torture/rpc/samba3rpc.c b/source4/torture/rpc/samba3rpc.c
index 8df3043b431ff37052eed5af7b7adad610d52445..c2e719b3e15267c3b1baa0b1db9c8c8fdbf0e991 100644 (file)
--- a/source4/torture/rpc/samba3rpc.c
+++ b/source4/torture/rpc/samba3rpc.c
@@ -1891,7 +1891,7 @@ static NTSTATUS set_sharesec(TALLOC_CTX *mem_ctx,
        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;