From fcaa86f4026cac94ed257406cbf4a59947b6029f Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Thu, 26 Aug 2010 14:37:00 +1000 Subject: s3-privs Further changes to remove SE_PRIV Signed-off-by: Andrew Tridgell --- source3/rpc_server/srv_lsa_nt.c | 12 ++++++------ source3/rpc_server/srv_samr_nt.c | 12 ++++++------ source3/rpc_server/srv_spoolss_nt.c | 18 +++++++++--------- source3/rpc_server/srv_srvsvc_nt.c | 8 ++++---- 4 files changed, 25 insertions(+), 25 deletions(-) (limited to 'source3/rpc_server') diff --git a/source3/rpc_server/srv_lsa_nt.c b/source3/rpc_server/srv_lsa_nt.c index 235ec12b58..12fd6a948f 100644 --- a/source3/rpc_server/srv_lsa_nt.c +++ b/source3/rpc_server/srv_lsa_nt.c @@ -1836,7 +1836,7 @@ NTSTATUS _lsa_EnumPrivsAccount(struct pipes_struct *p, { NTSTATUS status = NT_STATUS_OK; struct lsa_info *info=NULL; - SE_PRIV mask; + uint64_t mask; PRIVILEGE_SET privileges; struct lsa_PrivilegeSet *priv_set = NULL; struct lsa_LUIDAttribute *luid_attrs = NULL; @@ -1995,7 +1995,7 @@ NTSTATUS _lsa_AddPrivilegesToAccount(struct pipes_struct *p, struct lsa_AddPrivilegesToAccount *r) { struct lsa_info *info = NULL; - SE_PRIV mask; + uint64_t mask; struct lsa_PrivilegeSet *set = NULL; /* find the connection policy handle. */ @@ -2034,7 +2034,7 @@ NTSTATUS _lsa_RemovePrivilegesFromAccount(struct pipes_struct *p, struct lsa_RemovePrivilegesFromAccount *r) { struct lsa_info *info = NULL; - SE_PRIV mask; + uint64_t mask; struct lsa_PrivilegeSet *set = NULL; /* find the connection policy handle. */ @@ -2350,7 +2350,7 @@ NTSTATUS _lsa_EnumAccountRights(struct pipes_struct *p, struct lsa_info *info = NULL; struct dom_sid sid; PRIVILEGE_SET privileges; - SE_PRIV mask; + uint64_t mask; /* find the connection policy handle. */ @@ -2405,7 +2405,7 @@ NTSTATUS _lsa_LookupPrivValue(struct pipes_struct *p, struct lsa_info *info = NULL; const char *name = NULL; struct lsa_LUIDAttribute priv_luid; - SE_PRIV mask; + uint64_t mask; /* find the connection policy handle. */ @@ -2446,7 +2446,7 @@ NTSTATUS _lsa_EnumAccountsWithUserRight(struct pipes_struct *p, struct dom_sid *sids = NULL; int num_sids = 0; uint32_t i; - SE_PRIV mask; + uint64_t mask; if (!find_policy_by_hnd(p, r->in.handle, (void **)(void *)&info)) { return NT_STATUS_INVALID_HANDLE; diff --git a/source3/rpc_server/srv_samr_nt.c b/source3/rpc_server/srv_samr_nt.c index 6e83a3e4e5..87e50a5d40 100644 --- a/source3/rpc_server/srv_samr_nt.c +++ b/source3/rpc_server/srv_samr_nt.c @@ -180,7 +180,7 @@ static NTSTATUS make_samr_object_sd( TALLOC_CTX *ctx, struct security_descriptor ********************************************************************/ NTSTATUS access_check_object( struct security_descriptor *psd, NT_USER_TOKEN *token, - SE_PRIV *rights, uint32 rights_mask, + uint64_t *rights, uint32 rights_mask, uint32 des_access, uint32 *acc_granted, const char *debug ) { @@ -545,7 +545,7 @@ NTSTATUS _samr_OpenDomain(struct pipes_struct *p, NTSTATUS status; size_t sd_size; uint32_t extra_access = SAMR_DOMAIN_ACCESS_CREATE_USER; - SE_PRIV se_rights; + uint64_t se_rights; /* find the connection policy handle. */ @@ -2253,7 +2253,7 @@ NTSTATUS _samr_OpenUser(struct pipes_struct *p, size_t sd_size; bool ret; NTSTATUS nt_status; - SE_PRIV se_rights; + uint64_t se_rights; NTSTATUS status; dinfo = policy_handle_find(p, r->in.domain_handle, @@ -3807,7 +3807,7 @@ NTSTATUS _samr_CreateUser2(struct pipes_struct *p, /* check this, when giving away 'add computer to domain' privs */ uint32 des_access = GENERIC_RIGHTS_USER_ALL_ACCESS; bool can_add_account = False; - SE_PRIV se_rights; + uint64_t se_rights; dinfo = policy_handle_find(p, r->in.domain_handle, SAMR_DOMAIN_ACCESS_CREATE_USER, NULL, @@ -4233,7 +4233,7 @@ NTSTATUS _samr_OpenAlias(struct pipes_struct *p, uint32 des_access = r->in.access_mask; size_t sd_size; NTSTATUS status; - SE_PRIV se_rights; + uint64_t se_rights; dinfo = policy_handle_find(p, r->in.domain_handle, SAMR_DOMAIN_ACCESS_OPEN_ACCOUNT, NULL, @@ -6312,7 +6312,7 @@ NTSTATUS _samr_OpenGroup(struct pipes_struct *p, size_t sd_size; NTSTATUS status; bool ret; - SE_PRIV se_rights; + uint64_t se_rights; dinfo = policy_handle_find(p, r->in.domain_handle, SAMR_DOMAIN_ACCESS_OPEN_ACCOUNT, NULL, diff --git a/source3/rpc_server/srv_spoolss_nt.c b/source3/rpc_server/srv_spoolss_nt.c index 881f0e5555..9a9e3f52f1 100644 --- a/source3/rpc_server/srv_spoolss_nt.c +++ b/source3/rpc_server/srv_spoolss_nt.c @@ -364,7 +364,7 @@ static WERROR delete_printer_hook(TALLOC_CTX *ctx, NT_USER_TOKEN *token, char *cmd = lp_deleteprinter_cmd(); char *command = NULL; int ret; - SE_PRIV se_printop = SE_PRINT_OPERATOR; + uint64_t se_printop = SE_PRINT_OPERATOR; bool is_print_op = false; /* can't fail if we don't try */ @@ -1743,7 +1743,7 @@ WERROR _spoolss_OpenPrinterEx(struct pipes_struct *p, if ( r->in.access_mask & SERVER_ACCESS_ADMINISTER ) { - SE_PRIV se_printop = SE_PRINT_OPERATOR; + uint64_t se_printop = SE_PRINT_OPERATOR; if (!lp_ms_add_printer_wizard()) { close_printer_handle(p, r->out.handle); @@ -1995,7 +1995,7 @@ WERROR _spoolss_DeletePrinterDriver(struct pipes_struct *p, struct spoolss_DriverInfo8 *info_win2k = NULL; int version; WERROR status; - SE_PRIV se_printop = SE_PRINT_OPERATOR; + uint64_t se_printop = SE_PRINT_OPERATOR; /* if the user is not root, doesn't have SE_PRINT_OPERATOR privilege, and not a printer admin, then fail */ @@ -2101,7 +2101,7 @@ WERROR _spoolss_DeletePrinterDriverEx(struct pipes_struct *p, int version; bool delete_files; WERROR status; - SE_PRIV se_printop = SE_PRINT_OPERATOR; + uint64_t se_printop = SE_PRINT_OPERATOR; /* if the user is not root, doesn't have SE_PRINT_OPERATOR privilege, and not a printer admin, then fail */ @@ -5864,7 +5864,7 @@ static WERROR add_port_hook(TALLOC_CTX *ctx, NT_USER_TOKEN *token, const char *p char *cmd = lp_addport_cmd(); char *command = NULL; int ret; - SE_PRIV se_printop = SE_PRINT_OPERATOR; + uint64_t se_printop = SE_PRINT_OPERATOR; bool is_print_op = false; if ( !*cmd ) { @@ -5919,7 +5919,7 @@ static bool add_printer_hook(TALLOC_CTX *ctx, NT_USER_TOKEN *token, int numlines; int ret; int fd; - SE_PRIV se_printop = SE_PRINT_OPERATOR; + uint64_t se_printop = SE_PRINT_OPERATOR; bool is_print_op = false; if (!remote_machine) { @@ -8248,7 +8248,7 @@ WERROR _spoolss_AddForm(struct pipes_struct *p, struct spoolss_AddFormInfo1 *form = r->in.info.info1; int snum = -1; WERROR status = WERR_OK; - SE_PRIV se_printop = SE_PRINT_OPERATOR; + uint64_t se_printop = SE_PRINT_OPERATOR; struct printer_handle *Printer = find_printer_index_by_hnd(p, r->in.handle); @@ -8322,7 +8322,7 @@ WERROR _spoolss_DeleteForm(struct pipes_struct *p, struct printer_handle *Printer = find_printer_index_by_hnd(p, r->in.handle); int snum = -1; WERROR status = WERR_OK; - SE_PRIV se_printop = SE_PRINT_OPERATOR; + uint64_t se_printop = SE_PRINT_OPERATOR; DEBUG(5,("_spoolss_DeleteForm\n")); @@ -8382,7 +8382,7 @@ WERROR _spoolss_SetForm(struct pipes_struct *p, const char *form_name = r->in.form_name; int snum = -1; WERROR status = WERR_OK; - SE_PRIV se_printop = SE_PRINT_OPERATOR; + uint64_t se_printop = SE_PRINT_OPERATOR; struct printer_handle *Printer = find_printer_index_by_hnd(p, r->in.handle); diff --git a/source3/rpc_server/srv_srvsvc_nt.c b/source3/rpc_server/srv_srvsvc_nt.c index ceee47d443..ee879e89f7 100644 --- a/source3/rpc_server/srv_srvsvc_nt.c +++ b/source3/rpc_server/srv_srvsvc_nt.c @@ -1535,7 +1535,7 @@ WERROR _srvsvc_NetShareSetInfo(struct pipes_struct *p, int ret; char *path = NULL; struct security_descriptor *psd = NULL; - SE_PRIV se_diskop = SE_DISK_OPERATOR; + uint64_t se_diskop = SE_DISK_OPERATOR; bool is_disk_op = False; int max_connections = 0; TALLOC_CTX *ctx = p->mem_ctx; @@ -1764,7 +1764,7 @@ WERROR _srvsvc_NetShareAdd(struct pipes_struct *p, int ret; char *path; struct security_descriptor *psd = NULL; - SE_PRIV se_diskop = SE_DISK_OPERATOR; + uint64_t se_diskop = SE_DISK_OPERATOR; bool is_disk_op; int max_connections = 0; TALLOC_CTX *ctx = p->mem_ctx; @@ -1941,7 +1941,7 @@ WERROR _srvsvc_NetShareDel(struct pipes_struct *p, char *share_name = NULL; int ret; int snum; - SE_PRIV se_diskop = SE_DISK_OPERATOR; + uint64_t se_diskop = SE_DISK_OPERATOR; bool is_disk_op; struct share_params *params; TALLOC_CTX *ctx = p->mem_ctx; @@ -2517,7 +2517,7 @@ WERROR _srvsvc_NetFileClose(struct pipes_struct *p, struct srvsvc_NetFileClose *r) { struct enum_file_close_state state; - SE_PRIV se_diskop = SE_DISK_OPERATOR; + uint64_t se_diskop = SE_DISK_OPERATOR; bool is_disk_op; DEBUG(5,("_srvsvc_NetFileClose: %d\n", __LINE__)); -- cgit