summaryrefslogtreecommitdiff
path: root/source3/smbd/posix_acls.c
diff options
context:
space:
mode:
authorVolker Lendecke <vlendec@samba.org>2005-04-09 11:46:40 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 10:56:33 -0500
commit83e11ba86c2401ece3c845fd10c22b84e6be7811 (patch)
tree4441dcc906c860effaadcf6e730245ef10626103 /source3/smbd/posix_acls.c
parent16167208cfb5d8f995126a4af98911240d58e007 (diff)
downloadsamba-83e11ba86c2401ece3c845fd10c22b84e6be7811.tar.gz
samba-83e11ba86c2401ece3c845fd10c22b84e6be7811.tar.bz2
samba-83e11ba86c2401ece3c845fd10c22b84e6be7811.zip
r6263: Get rid of generate_wellknown_sids, they are const static and initializable
statically. Volker (This used to be commit 3493d9f383567d286e69c0e60c0708ed400a04d9)
Diffstat (limited to 'source3/smbd/posix_acls.c')
-rw-r--r--source3/smbd/posix_acls.c11
1 files changed, 3 insertions, 8 deletions
diff --git a/source3/smbd/posix_acls.c b/source3/smbd/posix_acls.c
index 31135f0907..e0d98f4b89 100644
--- a/source3/smbd/posix_acls.c
+++ b/source3/smbd/posix_acls.c
@@ -22,11 +22,6 @@
#include "includes.h"
extern struct current_user current_user;
-extern DOM_SID global_sid_Creator_Owner;
-extern DOM_SID global_sid_Creator_Group;
-extern DOM_SID global_sid_World;
-extern DOM_SID global_sid_Builtin_Administrators;
-extern DOM_SID global_sid_Builtin_Users;
extern struct generic_mapping file_generic_mapping;
#undef DBGC_CLASS
@@ -1045,8 +1040,8 @@ static BOOL uid_entry_in_group( canon_ace *uid_ace, canon_ace *group_ace )
static BOOL ensure_canon_entry_valid(canon_ace **pp_ace,
files_struct *fsp,
- DOM_SID *pfile_owner_sid,
- DOM_SID *pfile_grp_sid,
+ const DOM_SID *pfile_owner_sid,
+ const DOM_SID *pfile_grp_sid,
SMB_STRUCT_STAT *pst,
BOOL setting_acl)
{
@@ -2063,7 +2058,7 @@ static void arrange_posix_perms( char *filename, canon_ace **pp_list_head)
****************************************************************************/
static canon_ace *canonicalise_acl( files_struct *fsp, SMB_ACL_T posix_acl, SMB_STRUCT_STAT *psbuf,
- DOM_SID *powner, DOM_SID *pgroup, struct pai_val *pal, SMB_ACL_TYPE_T the_acl_type)
+ const DOM_SID *powner, const DOM_SID *pgroup, struct pai_val *pal, SMB_ACL_TYPE_T the_acl_type)
{
connection_struct *conn = fsp->conn;
mode_t acl_mask = (S_IRUSR|S_IWUSR|S_IXUSR);