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/rpc_server/srv_eventlog_nt.c | 2 +- source3/rpc_server/srv_lsa_nt.c | 12 ++++++------ source3/rpc_server/srv_samr_nt.c | 18 +++++++++--------- source3/rpc_server/srv_srvsvc_nt.c | 14 +++++++------- source3/rpc_server/srv_svcctl_nt.c | 14 +++++++------- 5 files changed, 30 insertions(+), 30 deletions(-) (limited to 'source3/rpc_server') diff --git a/source3/rpc_server/srv_eventlog_nt.c b/source3/rpc_server/srv_eventlog_nt.c index 84c04fe953..4171ef6d97 100644 --- a/source3/rpc_server/srv_eventlog_nt.c +++ b/source3/rpc_server/srv_eventlog_nt.c @@ -72,7 +72,7 @@ static EVENTLOG_INFO *find_eventlog_info_by_hnd( pipes_struct * p, static bool elog_check_access( EVENTLOG_INFO *info, NT_USER_TOKEN *token ) { char *tdbname = elog_tdbname(talloc_tos(), info->logname ); - SEC_DESC *sec_desc; + struct security_descriptor *sec_desc; NTSTATUS status; if ( !tdbname ) diff --git a/source3/rpc_server/srv_lsa_nt.c b/source3/rpc_server/srv_lsa_nt.c index 9477ec0ba2..8540b59b0b 100644 --- a/source3/rpc_server/srv_lsa_nt.c +++ b/source3/rpc_server/srv_lsa_nt.c @@ -312,7 +312,7 @@ static NTSTATUS lookup_lsa_sids(TALLOC_CTX *mem_ctx, return NT_STATUS_OK; } -static NTSTATUS make_lsa_object_sd(TALLOC_CTX *mem_ctx, SEC_DESC **sd, size_t *sd_size, +static NTSTATUS make_lsa_object_sd(TALLOC_CTX *mem_ctx, struct security_descriptor **sd, size_t *sd_size, const struct generic_mapping *map, DOM_SID *sid, uint32_t sid_access) { @@ -366,7 +366,7 @@ NTSTATUS _lsa_OpenPolicy2(pipes_struct *p, struct lsa_OpenPolicy2 *r) { struct lsa_info *info; - SEC_DESC *psd = NULL; + struct security_descriptor *psd = NULL; size_t sd_size; uint32 des_access = r->in.access_mask; uint32 acc_granted; @@ -1759,7 +1759,7 @@ NTSTATUS _lsa_OpenAccount(pipes_struct *p, { struct lsa_info *handle; struct lsa_info *info; - SEC_DESC *psd = NULL; + struct security_descriptor *psd = NULL; size_t sd_size; uint32_t des_access = r->in.access_mask; uint32_t acc_granted; @@ -2115,7 +2115,7 @@ NTSTATUS _lsa_QuerySecurity(pipes_struct *p, struct lsa_QuerySecurity *r) { struct lsa_info *handle=NULL; - SEC_DESC *psd = NULL; + struct security_descriptor *psd = NULL; size_t sd_size; NTSTATUS status; @@ -2160,7 +2160,7 @@ NTSTATUS _lsa_AddAccountRights(pipes_struct *p, struct lsa_info *info = NULL; int i = 0; uint32_t acc_granted = 0; - SEC_DESC *psd = NULL; + struct security_descriptor *psd = NULL; size_t sd_size; DOM_SID sid; NTSTATUS status; @@ -2229,7 +2229,7 @@ NTSTATUS _lsa_RemoveAccountRights(pipes_struct *p, { struct lsa_info *info = NULL; int i = 0; - SEC_DESC *psd = NULL; + struct security_descriptor *psd = NULL; size_t sd_size; DOM_SID sid; const char *privname = NULL; diff --git a/source3/rpc_server/srv_samr_nt.c b/source3/rpc_server/srv_samr_nt.c index 100a1762c7..1dd0088f9c 100644 --- a/source3/rpc_server/srv_samr_nt.c +++ b/source3/rpc_server/srv_samr_nt.c @@ -122,7 +122,7 @@ static const struct generic_mapping ali_generic_mapping = { /******************************************************************* *******************************************************************/ -static NTSTATUS make_samr_object_sd( TALLOC_CTX *ctx, SEC_DESC **psd, size_t *sd_size, +static NTSTATUS make_samr_object_sd( TALLOC_CTX *ctx, struct security_descriptor **psd, size_t *sd_size, const struct generic_mapping *map, DOM_SID *sid, uint32 sid_access ) { @@ -177,7 +177,7 @@ static NTSTATUS make_samr_object_sd( TALLOC_CTX *ctx, SEC_DESC **psd, size_t *sd level of access for further checks. ********************************************************************/ -NTSTATUS access_check_object( SEC_DESC *psd, NT_USER_TOKEN *token, +NTSTATUS access_check_object( struct security_descriptor *psd, NT_USER_TOKEN *token, SE_PRIV *rights, uint32 rights_mask, uint32 des_access, uint32 *acc_granted, const char *debug ) @@ -537,7 +537,7 @@ NTSTATUS _samr_OpenDomain(pipes_struct *p, { struct samr_connect_info *cinfo; struct samr_domain_info *dinfo; - SEC_DESC *psd = NULL; + struct security_descriptor *psd = NULL; uint32 acc_granted; uint32 des_access = r->in.access_mask; NTSTATUS status; @@ -775,7 +775,7 @@ NTSTATUS _samr_QuerySecurity(pipes_struct *p, struct samr_group_info *ginfo; struct samr_alias_info *ainfo; NTSTATUS status; - SEC_DESC * psd = NULL; + struct security_descriptor * psd = NULL; size_t sd_size = 0; cinfo = policy_handle_find(p, r->in.handle, @@ -2240,7 +2240,7 @@ NTSTATUS _samr_OpenUser(pipes_struct *p, DOM_SID sid; struct samr_domain_info *dinfo; struct samr_user_info *uinfo; - SEC_DESC *psd = NULL; + struct security_descriptor *psd = NULL; uint32 acc_granted; uint32 des_access = r->in.access_mask; uint32_t extra_access = 0; @@ -3754,7 +3754,7 @@ NTSTATUS _samr_CreateUser2(pipes_struct *p, struct samr_user_info *uinfo; NTSTATUS nt_status; uint32 acc_granted; - SEC_DESC *psd; + struct security_descriptor *psd; size_t sd_size; /* check this, when giving away 'add computer to domain' privs */ uint32 des_access = GENERIC_RIGHTS_USER_ALL_ACCESS; @@ -3955,7 +3955,7 @@ NTSTATUS _samr_Connect2(pipes_struct *p, { struct samr_connect_info *info = NULL; struct policy_handle hnd; - SEC_DESC *psd = NULL; + struct security_descriptor *psd = NULL; uint32 acc_granted; uint32 des_access = r->in.access_mask; NTSTATUS nt_status; @@ -4180,7 +4180,7 @@ NTSTATUS _samr_OpenAlias(pipes_struct *p, uint32 alias_rid = r->in.rid; struct samr_alias_info *ainfo; struct samr_domain_info *dinfo; - SEC_DESC *psd = NULL; + struct security_descriptor *psd = NULL; uint32 acc_granted; uint32 des_access = r->in.access_mask; size_t sd_size; @@ -6247,7 +6247,7 @@ NTSTATUS _samr_OpenGroup(pipes_struct *p, GROUP_MAP map; struct samr_domain_info *dinfo; struct samr_group_info *ginfo; - SEC_DESC *psd = NULL; + struct security_descriptor *psd = NULL; uint32 acc_granted; uint32 des_access = r->in.access_mask; size_t sd_size; diff --git a/source3/rpc_server/srv_srvsvc_nt.c b/source3/rpc_server/srv_srvsvc_nt.c index 904664f223..3888061ee4 100644 --- a/source3/rpc_server/srv_srvsvc_nt.c +++ b/source3/rpc_server/srv_srvsvc_nt.c @@ -321,7 +321,7 @@ static void init_srv_share_info_2(pipes_struct *p, struct srvsvc_NetShareInfo2 * Map any generic bits to file specific bits. ********************************************************************/ -static void map_generic_share_sd_bits(SEC_DESC *psd) +static void map_generic_share_sd_bits(struct security_descriptor *psd) { int i; struct security_acl *ps_dacl = NULL; @@ -373,7 +373,7 @@ static void init_srv_share_info_502(pipes_struct *p, struct srvsvc_NetShareInfo5 { const char *net_name = lp_servicename(snum); char *path = NULL; - SEC_DESC *sd = NULL; + struct security_descriptor *sd = NULL; struct sec_desc_buf *sd_buf = NULL; size_t sd_size = 0; TALLOC_CTX *ctx = p->mem_ctx; @@ -471,7 +471,7 @@ static void init_srv_share_info_1007(pipes_struct *p, struct srvsvc_NetShareInfo static void init_srv_share_info_1501(pipes_struct *p, struct sec_desc_buf *r, int snum) { - SEC_DESC *sd; + struct security_descriptor *sd; size_t sd_size; TALLOC_CTX *ctx = p->mem_ctx; @@ -1515,7 +1515,7 @@ WERROR _srvsvc_NetShareSetInfo(pipes_struct *p, int snum; int ret; char *path = NULL; - SEC_DESC *psd = NULL; + struct security_descriptor *psd = NULL; SE_PRIV se_diskop = SE_DISK_OPERATOR; bool is_disk_op = False; int max_connections = 0; @@ -1711,7 +1711,7 @@ WERROR _srvsvc_NetShareSetInfo(pipes_struct *p, /* Replace SD if changed. */ if (psd) { - SEC_DESC *old_sd; + struct security_descriptor *old_sd; size_t sd_size; old_sd = get_share_security(p->mem_ctx, lp_servicename(snum), &sd_size); @@ -1745,7 +1745,7 @@ WERROR _srvsvc_NetShareAdd(pipes_struct *p, int snum; int ret; char *path; - SEC_DESC *psd = NULL; + struct security_descriptor *psd = NULL; SE_PRIV se_diskop = SE_DISK_OPERATOR; bool is_disk_op; int max_connections = 0; @@ -2074,7 +2074,7 @@ WERROR _srvsvc_NetGetFileSecurity(pipes_struct *p, struct srvsvc_NetGetFileSecurity *r) { struct smb_filename *smb_fname = NULL; - SEC_DESC *psd = NULL; + struct security_descriptor *psd = NULL; size_t sd_size; fstring servicename; SMB_STRUCT_STAT st; diff --git a/source3/rpc_server/srv_svcctl_nt.c b/source3/rpc_server/srv_svcctl_nt.c index 0975ef98c7..604066e372 100644 --- a/source3/rpc_server/srv_svcctl_nt.c +++ b/source3/rpc_server/srv_svcctl_nt.c @@ -121,7 +121,7 @@ static struct service_control_op* find_service_by_name( const char *name ) /******************************************************************** ********************************************************************/ -static NTSTATUS svcctl_access_check( SEC_DESC *sec_desc, NT_USER_TOKEN *token, +static NTSTATUS svcctl_access_check( struct security_descriptor *sec_desc, NT_USER_TOKEN *token, uint32 access_desired, uint32 *access_granted ) { if ( geteuid() == sec_initial_uid() ) { @@ -135,11 +135,11 @@ static NTSTATUS svcctl_access_check( SEC_DESC *sec_desc, NT_USER_TOKEN *token, /******************************************************************** ********************************************************************/ -static SEC_DESC* construct_scm_sd( TALLOC_CTX *ctx ) +static struct security_descriptor* construct_scm_sd( TALLOC_CTX *ctx ) { struct security_ace ace[2]; size_t i = 0; - SEC_DESC *sd; + struct security_descriptor *sd; struct security_acl *theacl; size_t sd_size; @@ -255,7 +255,7 @@ done: WERROR _svcctl_OpenSCManagerW(pipes_struct *p, struct svcctl_OpenSCManagerW *r) { - SEC_DESC *sec_desc; + struct security_descriptor *sec_desc; uint32 access_granted = 0; NTSTATUS status; @@ -280,7 +280,7 @@ WERROR _svcctl_OpenSCManagerW(pipes_struct *p, WERROR _svcctl_OpenServiceW(pipes_struct *p, struct svcctl_OpenServiceW *r) { - SEC_DESC *sec_desc; + struct security_descriptor *sec_desc; uint32 access_granted = 0; NTSTATUS status; const char *service = NULL; @@ -854,7 +854,7 @@ WERROR _svcctl_QueryServiceObjectSecurity(pipes_struct *p, struct svcctl_QueryServiceObjectSecurity *r) { SERVICE_INFO *info = find_service_info_by_hnd( p, r->in.handle ); - SEC_DESC *sec_desc; + struct security_descriptor *sec_desc; NTSTATUS status; uint8_t *buffer = NULL; size_t len = 0; @@ -905,7 +905,7 @@ WERROR _svcctl_SetServiceObjectSecurity(pipes_struct *p, struct svcctl_SetServiceObjectSecurity *r) { SERVICE_INFO *info = find_service_info_by_hnd( p, r->in.handle ); - SEC_DESC *sec_desc = NULL; + struct security_descriptor *sec_desc = NULL; uint32 required_access; NTSTATUS status; -- cgit