r25730: Fix IDL for incorrect winreg_SetKeySecurity.

Guenther

diff --git a/source/librpc/idl/winreg.idl b/source/librpc/idl/winreg.idl
index a0211ad1a2a3cf9d014e6abbdb69b38647013769..d8f50990db2f454377e47ac1d27270d2776cb3ce 100644 (file)
--- a/source/librpc/idl/winreg.idl
+++ b/source/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/source/torture/rpc/winreg.c b/source/torture/rpc/winreg.c
index d9514ad9bbe43b4dc05db6bfa26b6000eedb816a..4b00c0326002af8def313fac15f5c4654b69ea5e 100644 (file)
--- a/source/torture/rpc/winreg.c
+++ b/source/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,