From 50b7a3233f1edc184acb0b65870fff1db1226ef4 Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Sun, 10 Jan 2010 17:30:54 +0100 Subject: s3: Remove unused samr_make_sam_obj_sd --- source3/include/proto.h | 1 - source3/lib/util_seaccess.c | 40 ---------------------------------------- 2 files changed, 41 deletions(-) diff --git a/source3/include/proto.h b/source3/include/proto.h index ce14feb8eb..8e8b35cb5a 100644 --- a/source3/include/proto.h +++ b/source3/include/proto.h @@ -1288,7 +1288,6 @@ void security_acl_map_generic(struct security_acl *sa, const struct generic_mapp void se_map_standard(uint32 *access_mask, struct standard_mapping *mapping); NTSTATUS se_access_check(const SEC_DESC *sd, const NT_USER_TOKEN *token, uint32 acc_desired, uint32 *acc_granted); -NTSTATUS samr_make_sam_obj_sd(TALLOC_CTX *ctx, SEC_DESC **psd, size_t *sd_size); /* The following definitions come from lib/util_sec.c */ diff --git a/source3/lib/util_seaccess.c b/source3/lib/util_seaccess.c index 0da7442d19..e5562b5289 100644 --- a/source3/lib/util_seaccess.c +++ b/source3/lib/util_seaccess.c @@ -246,43 +246,3 @@ done: return NT_STATUS_OK; } - -/******************************************************************* - samr_make_sam_obj_sd - ********************************************************************/ - -NTSTATUS samr_make_sam_obj_sd(TALLOC_CTX *ctx, SEC_DESC **psd, size_t *sd_size) -{ - DOM_SID adm_sid; - DOM_SID act_sid; - - SEC_ACE ace[3]; - - SEC_ACL *psa = NULL; - - sid_copy(&adm_sid, &global_sid_Builtin); - sid_append_rid(&adm_sid, BUILTIN_ALIAS_RID_ADMINS); - - sid_copy(&act_sid, &global_sid_Builtin); - sid_append_rid(&act_sid, BUILTIN_ALIAS_RID_ACCOUNT_OPS); - - /*basic access for every one*/ - init_sec_ace(&ace[0], &global_sid_World, SEC_ACE_TYPE_ACCESS_ALLOWED, - GENERIC_RIGHTS_SAM_EXECUTE | GENERIC_RIGHTS_SAM_READ, 0); - - /*full access for builtin aliases Administrators and Account Operators*/ - init_sec_ace(&ace[1], &adm_sid, - SEC_ACE_TYPE_ACCESS_ALLOWED, GENERIC_RIGHTS_SAM_ALL_ACCESS, 0); - init_sec_ace(&ace[2], &act_sid, - SEC_ACE_TYPE_ACCESS_ALLOWED, GENERIC_RIGHTS_SAM_ALL_ACCESS, 0); - - if ((psa = make_sec_acl(ctx, NT4_ACL_REVISION, 3, ace)) == NULL) - return NT_STATUS_NO_MEMORY; - - if ((*psd = make_sec_desc(ctx, SECURITY_DESCRIPTOR_REVISION_1, - SEC_DESC_SELF_RELATIVE, NULL, NULL, NULL, - psa, sd_size)) == NULL) - return NT_STATUS_NO_MEMORY; - - return NT_STATUS_OK; -} -- cgit