From 7f6bb48bdf230465fd26514ff43d92e2c1f32fe6 Mon Sep 17 00:00:00 2001 From: Günther Deschner Date: Tue, 18 May 2010 10:29:34 +0200 Subject: s3-secdesc: remove "typedef struct security_descriptor SEC_DESC". Guenther --- source3/utils/net_rpc.c | 4 ++-- source3/utils/net_rpc_printer.c | 2 +- source3/utils/net_usershare.c | 2 +- source3/utils/profiles.c | 4 ++-- source3/utils/sharesec.c | 10 +++++----- source3/utils/smbcacls.c | 22 +++++++++++----------- 6 files changed, 22 insertions(+), 22 deletions(-) (limited to 'source3/utils') diff --git a/source3/utils/net_rpc.c b/source3/utils/net_rpc.c index 253e9771c2..0ce2cd5d49 100644 --- a/source3/utils/net_rpc.c +++ b/source3/utils/net_rpc.c @@ -4420,8 +4420,8 @@ static void show_userlist(struct rpc_pipe_client *pipe_hnd, struct user_token *tokens) { uint16_t fnum; - SEC_DESC *share_sd = NULL; - SEC_DESC *root_sd = NULL; + struct security_descriptor *share_sd = NULL; + struct security_descriptor *root_sd = NULL; struct cli_state *cli = rpc_pipe_np_smb_conn(pipe_hnd); int i; union srvsvc_NetShareInfo info; diff --git a/source3/utils/net_rpc_printer.c b/source3/utils/net_rpc_printer.c index f627f1916c..e81e4c9610 100644 --- a/source3/utils/net_rpc_printer.c +++ b/source3/utils/net_rpc_printer.c @@ -153,7 +153,7 @@ NTSTATUS net_copy_fileattr(struct net_context *c, NTSTATUS nt_status = NT_STATUS_UNSUCCESSFUL; uint16_t fnum_src = 0; uint16_t fnum_dst = 0; - SEC_DESC *sd = NULL; + struct security_descriptor *sd = NULL; uint16_t attr; time_t f_atime, f_ctime, f_mtime; diff --git a/source3/utils/net_usershare.c b/source3/utils/net_usershare.c index 05b3cbd015..c005268d0b 100644 --- a/source3/utils/net_usershare.c +++ b/source3/utils/net_usershare.c @@ -330,7 +330,7 @@ static int info_fn(struct file_list *fl, void *priv) struct net_context *c = pi->c; int fd = -1; int numlines = 0; - SEC_DESC *psd = NULL; + struct security_descriptor *psd = NULL; char *basepath; char *sharepath = NULL; char *comment = NULL; diff --git a/source3/utils/profiles.c b/source3/utils/profiles.c index ff82fbd10a..e44b2f8e94 100644 --- a/source3/utils/profiles.c +++ b/source3/utils/profiles.c @@ -56,7 +56,7 @@ static void verbose_output(const char *format, ...) /******************************************************************** ********************************************************************/ -static bool swap_sid_in_acl( SEC_DESC *sd, DOM_SID *s1, DOM_SID *s2 ) +static bool swap_sid_in_acl( struct security_descriptor *sd, DOM_SID *s1, DOM_SID *s2 ) { struct security_acl *theacl; int i; @@ -117,7 +117,7 @@ static bool copy_registry_tree( REGF_FILE *infile, REGF_NK_REC *nk, const char *parentpath ) { REGF_NK_REC *key, *subkey; - SEC_DESC *new_sd; + struct security_descriptor *new_sd; struct regval_ctr *values; struct regsubkey_ctr *subkeys; int i; diff --git a/source3/utils/sharesec.c b/source3/utils/sharesec.c index da8dfa28b7..1264e4b51f 100644 --- a/source3/utils/sharesec.c +++ b/source3/utils/sharesec.c @@ -124,7 +124,7 @@ static void print_ace(FILE *f, struct security_ace *ace) print an ascii version of a security descriptor on a FILE handle ********************************************************************/ -static void sec_desc_print(FILE *f, SEC_DESC *sd) +static void sec_desc_print(FILE *f, struct security_descriptor *sd) { uint32 i; @@ -294,9 +294,9 @@ static bool parse_ace(struct security_ace *ace, const char *orig_str) /******************************************************************** ********************************************************************/ -static SEC_DESC* parse_acl_string(TALLOC_CTX *mem_ctx, const char *szACL, size_t *sd_size ) +static struct security_descriptor* parse_acl_string(TALLOC_CTX *mem_ctx, const char *szACL, size_t *sd_size ) { - SEC_DESC *sd = NULL; + struct security_descriptor *sd = NULL; struct security_ace *ace; struct security_acl *theacl; int num_ace; @@ -407,8 +407,8 @@ static void sort_acl(struct security_acl *the_acl) static int change_share_sec(TALLOC_CTX *mem_ctx, const char *sharename, char *the_acl, enum acl_mode mode) { - SEC_DESC *sd = NULL; - SEC_DESC *old = NULL; + struct security_descriptor *sd = NULL; + struct security_descriptor *old = NULL; size_t sd_size = 0; uint32 i, j; diff --git a/source3/utils/smbcacls.c b/source3/utils/smbcacls.c index f4307e3870..2344f2f0ab 100644 --- a/source3/utils/smbcacls.c +++ b/source3/utils/smbcacls.c @@ -552,11 +552,11 @@ static bool add_ace(struct security_acl **the_acl, struct security_ace *ace) } /* parse a ascii version of a security descriptor */ -static SEC_DESC *sec_desc_parse(TALLOC_CTX *ctx, struct cli_state *cli, char *str) +static struct security_descriptor *sec_desc_parse(TALLOC_CTX *ctx, struct cli_state *cli, char *str) { const char *p = str; char *tok; - SEC_DESC *ret = NULL; + struct security_descriptor *ret = NULL; size_t sd_size; DOM_SID *grp_sid=NULL, *owner_sid=NULL; struct security_acl *dacl=NULL; @@ -624,7 +624,7 @@ static SEC_DESC *sec_desc_parse(TALLOC_CTX *ctx, struct cli_state *cli, char *st /* print a ascii version of a security descriptor on a FILE handle */ -static void sec_desc_print(struct cli_state *cli, FILE *f, SEC_DESC *sd) +static void sec_desc_print(struct cli_state *cli, FILE *f, struct security_descriptor *sd) { fstring sidstr; uint32 i; @@ -691,10 +691,10 @@ static uint16 get_fileinfo(struct cli_state *cli, const char *filename) /***************************************************** get sec desc for filename *******************************************************/ -static SEC_DESC *get_secdesc(struct cli_state *cli, const char *filename) +static struct security_descriptor *get_secdesc(struct cli_state *cli, const char *filename) { uint16_t fnum = (uint16_t)-1; - SEC_DESC *sd; + struct security_descriptor *sd; /* The desired access below is the only one I could find that works with NT4, W2KP and Samba */ @@ -721,7 +721,7 @@ static SEC_DESC *get_secdesc(struct cli_state *cli, const char *filename) set sec desc for filename *******************************************************/ static bool set_secdesc(struct cli_state *cli, const char *filename, - SEC_DESC *sd) + struct security_descriptor *sd) { uint16_t fnum = (uint16_t)-1; bool result=true; @@ -753,7 +753,7 @@ dump the acls for a file static int cacl_dump(struct cli_state *cli, const char *filename) { int result = EXIT_FAILED; - SEC_DESC *sd; + struct security_descriptor *sd; if (test_args) return EXIT_OK; @@ -782,7 +782,7 @@ static int owner_set(struct cli_state *cli, enum chown_mode change_mode, const char *filename, const char *new_username) { DOM_SID sid; - SEC_DESC *sd, *old; + struct security_descriptor *sd, *old; size_t sd_size; if (!StringToSid(cli, &sid, new_username)) @@ -875,7 +875,7 @@ set the ACLs on a file given an ascii description static int cacl_set(struct cli_state *cli, const char *filename, char *the_acl, enum acl_mode mode) { - SEC_DESC *sd, *old; + struct security_descriptor *sd, *old; uint32 i, j; size_t sd_size; int result = EXIT_OK; @@ -993,7 +993,7 @@ set the inherit on a file static int inherit(struct cli_state *cli, const char *filename, const char *type) { - SEC_DESC *old,*sd; + struct security_descriptor *old,*sd; uint32 oldattr; size_t sd_size; int result = EXIT_OK; @@ -1011,7 +1011,7 @@ static int inherit(struct cli_state *cli, const char *filename, SEC_DESC_DACL_PROTECTED) { int i; char *parentname,*temp; - SEC_DESC *parent; + struct security_descriptor *parent; temp = talloc_strdup(talloc_tos(), filename); old->type=old->type & (~SEC_DESC_DACL_PROTECTED); -- cgit