clusapi: use winreg_AccessMask in clusapi.idl.

Make winreg_AccessMask public to access it outside winreg.idl.

Guenther

Signed-off-by: Günther Deschner <gd@samba.org>
Reviewed-by: Jose A. Rivera <jarrpa@samba.org>

diff --git a/librpc/idl/clusapi.idl b/librpc/idl/clusapi.idl
index 3e87114150dd2fd121a7a149dae89bde5e44f5b0..6485b81cd7e20467a2948dda00c86d764eb91605 100644 (file)
--- a/librpc/idl/clusapi.idl
+++ b/librpc/idl/clusapi.idl
@@ -1,4 +1,4 @@
-import "security.idl";
+import "security.idl", "winreg.idl";
 
 #include "idl_types.h"
 
@@ -464,14 +464,14 @@ import "security.idl";
 #if 0
        HKEY_RPC
        clusapi_GetRootKey(
-               [ in ] uint32 samDesired,
+               [ in ] winreg_AccessMask samDesired,
                [ out ] WERROR *Status,
                [ out ] WERROR *rpc_status
        );
 #else
        void
        clusapi_GetRootKey(
-               [ in ] uint32 samDesired,
+               [ in ] winreg_AccessMask samDesired,
                [ out ] WERROR *Status,
                [ out ] WERROR *rpc_status,
                [ out ] HKEY_RPC *phKey
@@ -485,7 +485,7 @@ import "security.idl";
                [ in ] HKEY_RPC hKey,
                [ in, string ] [charset(UTF16)] uint16 *lpSubKey,
                [ in ] uint32 dwOptions,
-               [ in ] uint32 samDesired,
+               [ in ] winreg_AccessMask samDesired,
                [ in, unique ] RPC_SECURITY_ATTRIBUTES *lpSecurityAttributes,
                [ out ] uint32 *lpdwDisposition,
                [ out ] WERROR *Status,
@@ -497,7 +497,7 @@ import "security.idl";
                [ in ] HKEY_RPC hKey,
                [ in, string ] [charset(UTF16)] uint16 *lpSubKey,
                [ in ] uint32 dwOptions,
-               [ in ] uint32 samDesired,
+               [ in ] winreg_AccessMask samDesired,
                [ in, unique ] RPC_SECURITY_ATTRIBUTES *lpSecurityAttributes,
                [ out ] uint32 *lpdwDisposition,
                [ out ] WERROR *Status,
@@ -512,7 +512,7 @@ import "security.idl";
        clusapi_OpenKey(
                [ in ] HKEY_RPC hKey,
                [ in, string ] [charset(UTF16)] uint16 *lpSubKey,
-               [ in ] uint32 samDesired,
+               [ in ] winreg_AccessMask samDesired,
                [ out ] WERROR *Status,
                [ out ] WERROR *rpc_status
        );
@@ -521,7 +521,7 @@ import "security.idl";
        clusapi_OpenKey(
                [ in ] HKEY_RPC hKey,
                [ in, string ] [charset(UTF16)] uint16 *lpSubKey,
-               [ in ] uint32 samDesired,
+               [ in ] winreg_AccessMask samDesired,
                [ out ] WERROR *Status,
                [ out ] WERROR *rpc_status,
                [ out ] HKEY_RPC *phKey

diff --git a/librpc/idl/winreg.idl b/librpc/idl/winreg.idl
index c5da3281b167d7f03c8cf8300612cf5dcaba8290..fb70f7dffbf16f25c490e8b46df8e0eeeaa590d1 100644 (file)
--- a/librpc/idl/winreg.idl
+++ b/librpc/idl/winreg.idl
@@ -18,7 +18,7 @@ import "lsa.idl", "security.idl", "misc.idl";
         * Access Bits for registry ACLS
         */
 
-       typedef [bitmap32bit] bitmap {
+       typedef [public,bitmap32bit] bitmap {
                KEY_QUERY_VALUE                 = 0x00001,
                KEY_SET_VALUE                   = 0x00002,
                KEY_CREATE_SUB_KEY              = 0x00004,