diff options
| author | Günther Deschner <gd@samba.org> | 2010-05-18 10:29:34 +0200 |
|---|---|---|
| committer | Günther Deschner <gd@samba.org> | 2010-05-18 12:30:12 +0200 |
| commit | 7f6bb48bdf230465fd26514ff43d92e2c1f32fe6 (patch) | |
| tree | c433add21e5bc3798d418a5d7a4715312093c3b4 /source3/registry | |
| parent | 8951c8301ac8436d49e1641b2cc7775dda44d914 (diff) | |
| download | samba-7f6bb48bdf230465fd26514ff43d92e2c1f32fe6.tar.gz samba-7f6bb48bdf230465fd26514ff43d92e2c1f32fe6.tar.bz2 samba-7f6bb48bdf230465fd26514ff43d92e2c1f32fe6.zip | |
s3-secdesc: remove "typedef struct security_descriptor SEC_DESC".
Guenther
Diffstat (limited to 'source3/registry')
| -rw-r--r-- | source3/registry/reg_api.c | 2 | ||||
| -rw-r--r-- | source3/registry/reg_dispatcher.c | 6 | ||||
| -rw-r--r-- | source3/registry/regfio.c | 6 |
3 files changed, 7 insertions, 7 deletions
diff --git a/source3/registry/reg_api.c b/source3/registry/reg_api.c index 27d7145375..0f130516c4 100644 --- a/source3/registry/reg_api.c +++ b/source3/registry/reg_api.c @@ -855,7 +855,7 @@ static WERROR reg_write_tree(REGF_FILE *regfile, const char *keypath, char *subkeyname; struct registry_key_handle registry_key; WERROR result = WERR_OK; - SEC_DESC *sec_desc = NULL; + struct security_descriptor *sec_desc = NULL; if (!regfile) { return WERR_GENERAL_FAILURE; diff --git a/source3/registry/reg_dispatcher.c b/source3/registry/reg_dispatcher.c index 46a49403fb..966935392f 100644 --- a/source3/registry/reg_dispatcher.c +++ b/source3/registry/reg_dispatcher.c @@ -35,11 +35,11 @@ static const struct generic_mapping reg_generic_map = /******************************************************************** ********************************************************************/ -static WERROR construct_registry_sd(TALLOC_CTX *ctx, SEC_DESC **psd) +static WERROR construct_registry_sd(TALLOC_CTX *ctx, struct security_descriptor **psd) { struct security_ace ace[3]; size_t i = 0; - SEC_DESC *sd; + struct security_descriptor *sd; struct security_acl *theacl; size_t sd_size; @@ -162,7 +162,7 @@ bool regkey_access_check(struct registry_key_handle *key, uint32 requested, uint32 *granted, const struct nt_user_token *token ) { - SEC_DESC *sec_desc; + struct security_descriptor *sec_desc; NTSTATUS status; WERROR err; diff --git a/source3/registry/regfio.c b/source3/registry/regfio.c index 1cb453d64f..60a05040e2 100644 --- a/source3/registry/regfio.c +++ b/source3/registry/regfio.c @@ -954,7 +954,7 @@ static REGF_SK_REC* find_sk_record_by_offset( REGF_FILE *file, uint32 offset ) /******************************************************************* *******************************************************************/ -static REGF_SK_REC* find_sk_record_by_sec_desc( REGF_FILE *file, SEC_DESC *sd ) +static REGF_SK_REC* find_sk_record_by_sec_desc( REGF_FILE *file, struct security_descriptor *sd ) { REGF_SK_REC *p; @@ -1568,7 +1568,7 @@ done: /******************************************************************* *******************************************************************/ -static uint32 sk_record_data_size( SEC_DESC * sd ) +static uint32 sk_record_data_size( struct security_descriptor * sd ) { uint32 size, size_mod8; @@ -1718,7 +1718,7 @@ static int hashrec_cmp( REGF_HASH_REC *h1, REGF_HASH_REC *h2 ) REGF_NK_REC* regfio_write_key( REGF_FILE *file, const char *name, struct regval_ctr *values, struct regsubkey_ctr *subkeys, - SEC_DESC *sec_desc, REGF_NK_REC *parent ) + struct security_descriptor *sec_desc, REGF_NK_REC *parent ) { REGF_NK_REC *nk; REGF_HBIN *vlist_hbin = NULL; |