From 4c713703d046f756989e7eb901e884829825593c Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Mon, 17 Jul 2006 19:53:15 +0000 Subject: r17097: Move share_access_check from rpc_server/srv_srvsvc_nt.c to lib/sharesec.c (This used to be commit 220dd4333032aea238066e3fbec9fca51ed16ddf) --- source3/lib/sharesec.c | 31 +++++++++++++++++++++++++++++++ source3/rpc_server/srv_srvsvc_nt.c | 31 ------------------------------- 2 files changed, 31 insertions(+), 31 deletions(-) diff --git a/source3/lib/sharesec.c b/source3/lib/sharesec.c index 9c40eb0ac7..0c8035e3dc 100644 --- a/source3/lib/sharesec.c +++ b/source3/lib/sharesec.c @@ -206,6 +206,37 @@ BOOL delete_share_security(int snum) return True; } +/******************************************************************* + Can this user access with share with the required permissions ? +********************************************************************/ + +BOOL share_access_check(const NT_USER_TOKEN *token, const char *sharename, + uint32 desired_access) +{ + uint32 granted; + NTSTATUS status; + TALLOC_CTX *mem_ctx = NULL; + SEC_DESC *psd = NULL; + size_t sd_size; + BOOL ret = True; + + if (!(mem_ctx = talloc_init("share_access_check"))) { + return False; + } + + psd = get_share_security(mem_ctx, sharename, &sd_size); + + if (!psd) { + TALLOC_FREE(mem_ctx); + return True; + } + + ret = se_access_check(psd, token, desired_access, &granted, &status); + + talloc_destroy(mem_ctx); + return ret; +} + /*************************************************************************** Parse the contents of an acl string from a usershare file. ***************************************************************************/ diff --git a/source3/rpc_server/srv_srvsvc_nt.c b/source3/rpc_server/srv_srvsvc_nt.c index 19099b931e..be4c51c0d2 100644 --- a/source3/rpc_server/srv_srvsvc_nt.c +++ b/source3/rpc_server/srv_srvsvc_nt.c @@ -316,37 +316,6 @@ static void map_generic_share_sd_bits(SEC_DESC *psd) } } -/******************************************************************* - Can this user access with share with the required permissions ? -********************************************************************/ - -BOOL share_access_check(const NT_USER_TOKEN *token, const char *sharename, - uint32 desired_access) -{ - uint32 granted; - NTSTATUS status; - TALLOC_CTX *mem_ctx = NULL; - SEC_DESC *psd = NULL; - size_t sd_size; - BOOL ret = True; - - if (!(mem_ctx = talloc_init("share_access_check"))) { - return False; - } - - psd = get_share_security(mem_ctx, sharename, &sd_size); - - if (!psd) { - TALLOC_FREE(mem_ctx); - return True; - } - - ret = se_access_check(psd, token, desired_access, &granted, &status); - - talloc_destroy(mem_ctx); - return ret; -} - /******************************************************************* Fill in a share info level 501 structure. ********************************************************************/ -- cgit