r11261: Rename access_required field in winreg idl to access_mask so it matches

the other interfaces.
(This used to be commit 8eb582b5780188b6304c560b3e84fd7d75c483f8)

diff --git a/source4/lib/registry/reg_backend_rpc.c b/source4/lib/registry/reg_backend_rpc.c
index 1e9fff4d7c296f777dd51781dc0ec371f756139c..81f002daa2291647dc79573286337833adf90f60 100644 (file)
--- a/source4/lib/registry/reg_backend_rpc.c
+++ b/source4/lib/registry/reg_backend_rpc.c
@@ -39,7 +39,7 @@ static void init_winreg_String(struct winreg_String *name, const char *s)
        NTSTATUS status; \
        \
        r.in.system_name = 0; \
-       r.in.access_required = SEC_FLAG_MAXIMUM_ALLOWED; \
+       r.in.access_mask = SEC_FLAG_MAXIMUM_ALLOWED; \
        r.out.handle = hnd;\
        \
        status = dcerpc_winreg_Open ## u(p, mem_ctx, &r); \
@@ -253,7 +253,7 @@ static WERROR rpc_add_key(TALLOC_CTX *mem_ctx, const struct registry_key *parent
        r.in.handle = parent->backend_data;
        r.out.new_handle = talloc(mem_ctx, struct policy_handle);       
        r.in.options = 0;
-       r.in.access_required = access_mask;
+       r.in.access_mask = access_mask;
        r.in.secdesc = NULL;
 
        status = dcerpc_winreg_CreateKey((struct dcerpc_pipe *)(parent->hive->backend_data), mem_ctx, &r);

diff --git a/source4/librpc/idl/winreg.idl b/source4/librpc/idl/winreg.idl
index 2948b28b73a3f9b5b8e6e0439a2cb1a60c20966a..83a95ebac4a4915b07fbceb0f504afb78ac8fe3a 100644 (file)
--- a/source4/librpc/idl/winreg.idl
+++ b/source4/librpc/idl/winreg.idl
@@ -41,7 +41,7 @@
        /* Function: 0x00 */
        WERROR winreg_OpenHKCR(
                [in]      uint16 *system_name,
-               [in]      uint32 access_required,
+               [in]      uint32 access_mask,
                [out,ref] policy_handle *handle
        );
 
@@ -49,7 +49,7 @@
        /* Function: 0x01 */
        WERROR winreg_OpenHKCU(
                [in]      uint16 *system_name,
-               [in]      uint32 access_required,
+               [in]      uint32 access_mask,
                [out,ref] policy_handle *handle
        );
 
@@ -57,7 +57,7 @@
        /* Function: 0x02 */
        WERROR winreg_OpenHKLM(
                [in]      uint16 *system_name,
-               [in]      uint32 access_required,
+               [in]      uint32 access_mask,
                [out,ref] policy_handle *handle
        );
 
@@ -65,7 +65,7 @@
        /* Function: 0x03 */
        WERROR winreg_OpenHKPD(
                [in]      uint16 *system_name,
-               [in]      uint32 access_required,
+               [in]      uint32 access_mask,
                [out,ref] policy_handle *handle
        );
 
@@ -73,7 +73,7 @@
        /* Function: 0x04 */
        WERROR winreg_OpenHKU(
                [in]      uint16 *system_name,
-               [in]      uint32 access_required,
+               [in]      uint32 access_mask,
                [out,ref] policy_handle *handle
        );
 
@@ -109,7 +109,7 @@
                [in] winreg_String name,
                [in] winreg_String class,
                [in] uint32 options,
-               [in] uint32 access_required,
+               [in] uint32 access_mask,
                [in,unique] winreg_SecBuf *secdesc,
                [out,ref] policy_handle *new_handle,
                [in,out,unique] winreg_CreateAction *action_taken
@@ -292,7 +292,7 @@
        /* Function: 0x1b */
        WERROR winreg_OpenHKCC(
                [in]      uint16 *system_name,
-               [in]      uint32 access_required,
+               [in]      uint32 access_mask,
                [out,ref] policy_handle *handle
        );
 
@@ -300,7 +300,7 @@
        /* Function: 0x1c */
        WERROR winreg_OpenHKDD(
                [in]      uint16 *system_name,
-               [in]      uint32 access_required,
+               [in]      uint32 access_mask,
                [out,ref] policy_handle *handle
        );
 
@@ -341,7 +341,7 @@
        /* Function: 0x20 */
        WERROR winreg_OpenHKPT(
                [in]      uint16 *system_name,
-               [in]      uint32 access_required,
+               [in]      uint32 access_mask,
                [out,ref] policy_handle *handle
        );
 
@@ -349,7 +349,7 @@
        /* Function: 0x21 */
        WERROR winreg_OpenHKPN(
                [in]      uint16 *system_name,
-               [in]      uint32 access_required,
+               [in]      uint32 access_mask,
                [out,ref] policy_handle *handle
        );
 

diff --git a/source4/rpc_server/winreg/rpc_winreg.c b/source4/rpc_server/winreg/rpc_winreg.c
index df92dfcff8ca87253687768a747256c02c24e128..7576dc0ec0417d328659a759504ffa5f5cd5cd1a 100644 (file)
--- a/source4/rpc_server/winreg/rpc_winreg.c
+++ b/source4/rpc_server/winreg/rpc_winreg.c
@@ -122,7 +122,7 @@ static WERROR winreg_CreateKey(struct dcesrv_call_state *dce_call, TALLOC_CTX *m
        }
 
        error = reg_key_add_name(newh, (struct registry_key *)h->data, r->in.name.name, 
-                                r->in.access_required, 
+                                r->in.access_mask, 
                                 r->in.secdesc?&sd:NULL, 
                                 (struct registry_key **)&newh->data);
        if (W_ERROR_IS_OK(error)) {

diff --git a/source4/torture/rpc/winreg.c b/source4/torture/rpc/winreg.c
index b0c2605bae60ac4b4adb8466565b3ed1e6c7af96..873ad10a2332adb0d716f8b43ce8ead659a31b42 100644 (file)
--- a/source4/torture/rpc/winreg.c
+++ b/source4/torture/rpc/winreg.c
@@ -116,7 +116,7 @@ static BOOL test_CreateKey(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
        init_winreg_String(&r.in.name, name);   
        init_winreg_String(&r.in.class, class);
        r.in.options = 0x0;
-       r.in.access_required = SEC_FLAG_MAXIMUM_ALLOWED;
+       r.in.access_mask = SEC_FLAG_MAXIMUM_ALLOWED;
        r.in.action_taken = r.out.action_taken = &action_taken;
        r.in.secdesc = NULL;
 
@@ -178,7 +178,7 @@ static BOOL test_CreateKey_sd(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
        init_winreg_String(&r.in.name, name);   
        init_winreg_String(&r.in.class, class);
        r.in.options = 0x0;
-       r.in.access_required = SEC_FLAG_MAXIMUM_ALLOWED;
+       r.in.access_mask = SEC_FLAG_MAXIMUM_ALLOWED;
        r.in.action_taken = r.out.action_taken = &action_taken;
        r.in.secdesc = &secbuf;
 
@@ -691,7 +691,7 @@ static BOOL test_Open(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
        printf("Testing %s\n", name);
 
        r.in.system_name = 0;
-       r.in.access_required = SEC_FLAG_MAXIMUM_ALLOWED;
+       r.in.access_mask = SEC_FLAG_MAXIMUM_ALLOWED;
        r.out.handle = &handle;
        
        status = open_fn(p, mem_ctx, &r);