diff options
| author | Günther Deschner <gd@samba.org> | 2007-10-25 11:12:02 +0200 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2007-12-21 05:43:31 +0100 |
| commit | ade07a34d9e717dff9b3775c3039e66ec2dfe69d (patch) | |
| tree | c839490c33226166d54e0bb66706d426cf4f8dbc /source4 | |
| parent | 33201d1df27c1ab6b1252b2de3c164a3330c9cf8 (diff) | |
| download | samba-ade07a34d9e717dff9b3775c3039e66ec2dfe69d.tar.gz samba-ade07a34d9e717dff9b3775c3039e66ec2dfe69d.tar.bz2 samba-ade07a34d9e717dff9b3775c3039e66ec2dfe69d.zip | |
r25730: Fix IDL for incorrect winreg_SetKeySecurity.
Guenther
(This used to be commit 767867c3ee126c3832750d1b1e7de81005c4eaff)
Diffstat (limited to 'source4')
| -rw-r--r-- | source4/librpc/idl/winreg.idl | 2 | ||||
| -rw-r--r-- | source4/torture/rpc/winreg.c | 18 |
2 files changed, 18 insertions, 2 deletions
diff --git a/source4/librpc/idl/winreg.idl b/source4/librpc/idl/winreg.idl index a0211ad1a2..d8f50990db 100644 --- a/source4/librpc/idl/winreg.idl +++ b/source4/librpc/idl/winreg.idl @@ -273,7 +273,7 @@ import "lsa.idl", "initshutdown.idl", "security.idl"; /* Function: 0x15 */ WERROR winreg_SetKeySecurity( [in,ref] policy_handle *handle, - [in] winreg_AccessMask access_mask, + [in] security_secinfo sec_info, [in,ref] KeySecurityData *sd ); diff --git a/source4/torture/rpc/winreg.c b/source4/torture/rpc/winreg.c index d9514ad9bb..4b00c03260 100644 --- a/source4/torture/rpc/winreg.c +++ b/source4/torture/rpc/winreg.c @@ -228,6 +228,7 @@ static bool test_SetKeySecurity(struct dcerpc_pipe *p, struct winreg_SetKeySecurity r; struct KeySecurityData *sdata = NULL; DATA_BLOB sdblob; + uint32_t sec_info; ZERO_STRUCT(r); @@ -245,8 +246,23 @@ static bool test_SetKeySecurity(struct dcerpc_pipe *p, sdata->size = sdblob.length; sdata->len = sdblob.length; + sec_info = SECINFO_UNPROTECTED_SACL | SECINFO_UNPROTECTED_DACL; + + if (sd->owner_sid) { + sec_info |= SECINFO_OWNER; + } + if (sd->group_sid) { + sec_info |= SECINFO_GROUP; + } + if (sd->sacl) { + sec_info |= SECINFO_SACL; + } + if (sd->dacl) { + sec_info |= SECINFO_DACL; + } + r.in.handle = handle; - r.in.access_mask = SEC_FLAG_MAXIMUM_ALLOWED; + r.in.sec_info = sec_info; r.in.sd = sdata; torture_assert_ntstatus_ok(tctx, |