diff options
Diffstat (limited to 'source3/include')
| -rw-r--r-- | source3/include/proto.h | 38 | ||||
| -rw-r--r-- | source3/include/reg_objects.h | 6 |
2 files changed, 25 insertions, 19 deletions
diff --git a/source3/include/proto.h b/source3/include/proto.h index 7fa8f03766..83436a370e 100644 --- a/source3/include/proto.h +++ b/source3/include/proto.h @@ -4859,20 +4859,25 @@ void reghook_dump_cache( int debuglevel ); /* The following definitions come from registry/reg_dispatcher.c */ -bool store_reg_keys( REGISTRY_KEY *key, struct regsubkey_ctr *subkeys ); -bool store_reg_values(REGISTRY_KEY *key, struct regval_ctr *val); -WERROR create_reg_subkey(REGISTRY_KEY *key, const char *subkey); -WERROR delete_reg_subkey(REGISTRY_KEY *key, const char *subkey); -int fetch_reg_keys( REGISTRY_KEY *key, struct regsubkey_ctr *subkey_ctr ); -int fetch_reg_values(REGISTRY_KEY *key, struct regval_ctr *val); -bool regkey_access_check( REGISTRY_KEY *key, uint32 requested, uint32 *granted, - const struct nt_user_token *token ); -WERROR regkey_get_secdesc(TALLOC_CTX *mem_ctx, REGISTRY_KEY *key, +bool store_reg_keys(struct registry_key_handle *key, + struct regsubkey_ctr *subkeys); +bool store_reg_values(struct registry_key_handle *key, struct regval_ctr *val); +WERROR create_reg_subkey(struct registry_key_handle *key, const char *subkey); +WERROR delete_reg_subkey(struct registry_key_handle *key, const char *subkey); +int fetch_reg_keys(struct registry_key_handle *key, + struct regsubkey_ctr *subkey_ctr); +int fetch_reg_values(struct registry_key_handle *key, struct regval_ctr *val); +bool regkey_access_check(struct registry_key_handle *key, uint32 requested, + uint32 *granted, + const struct nt_user_token *token); +WERROR regkey_get_secdesc(TALLOC_CTX *mem_ctx, struct registry_key_handle *key, struct security_descriptor **psecdesc); -WERROR regkey_set_secdesc(REGISTRY_KEY *key, +WERROR regkey_set_secdesc(struct registry_key_handle *key, struct security_descriptor *psecdesc); -bool reg_subkeys_need_update(REGISTRY_KEY *key, struct regsubkey_ctr *subkeys); -bool reg_values_need_update(REGISTRY_KEY *key, struct regval_ctr *values); +bool reg_subkeys_need_update(struct registry_key_handle *key, + struct regsubkey_ctr *subkeys); +bool reg_values_need_update(struct registry_key_handle *key, + struct regval_ctr *values); /* The following definitions come from registry/reg_eventlog.c */ @@ -4963,10 +4968,11 @@ size_t regval_build_multi_sz( char **values, uint16 **buffer ); /* The following definitions come from registry/reg_util_legacy.c */ -WERROR regkey_open_internal( TALLOC_CTX *ctx, REGISTRY_KEY **regkey, - const char *path, - const struct nt_user_token *token, - uint32 access_desired ); +WERROR regkey_open_internal(TALLOC_CTX *ctx, + struct registry_key_handle **regkey, + const char *path, + const struct nt_user_token *token, + uint32 access_desired ); /* The following definitions come from registry/regfio.c */ diff --git a/source3/include/reg_objects.h b/source3/include/reg_objects.h index bcc8376979..a3f9c9c591 100644 --- a/source3/include/reg_objects.h +++ b/source3/include/reg_objects.h @@ -153,15 +153,15 @@ typedef struct { /* structure to store the registry handles */ -typedef struct _RegistryKey { +struct registry_key_handle { uint32 type; char *name; /* full name of registry key */ uint32 access_granted; REGISTRY_OPS *ops; -} REGISTRY_KEY; +}; struct registry_key { - REGISTRY_KEY *key; + struct registry_key_handle *key; struct regsubkey_ctr *subkeys; struct regval_ctr *values; struct nt_user_token *token; |