summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2006-07-17 09:48:06 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 14:10:12 -0500
commitbca8f2d5680595744f872bf946d16bbdd2dc7320 (patch)
tree66d092e44286263072fa1d0748eb81b6195b7ba5
parent8075ce63fdbaeb2fe508097a46d794a49138c307 (diff)
downloadsamba-bca8f2d5680595744f872bf946d16bbdd2dc7320.tar.gz
samba-bca8f2d5680595744f872bf946d16bbdd2dc7320.tar.bz2
samba-bca8f2d5680595744f872bf946d16bbdd2dc7320.zip
r17085: reuse the existing sec_desc_buf struct
metze (This used to be commit 22463cbcdd159657d04657071451738e768d0b2a)
-rw-r--r--source4/librpc/idl/srvsvc.idl10
-rw-r--r--source4/torture/rpc/samba3rpc.c2
2 files changed, 4 insertions, 8 deletions
diff --git a/source4/librpc/idl/srvsvc.idl b/source4/librpc/idl/srvsvc.idl
index de41b23ce5..f253178d9a 100644
--- 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;
@@ -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;
diff --git a/source4/torture/rpc/samba3rpc.c b/source4/torture/rpc/samba3rpc.c
index 8df3043b43..c2e719b3e1 100644
--- 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;