diff options
author | Volker Lendecke <vlendec@samba.org> | 2005-04-09 11:46:40 +0000 |
---|---|---|
committer | Volker Lendecke <vlendec@samba.org> | 2005-04-09 11:46:40 +0000 |
commit | 836b6dcffa091b407b4e6120d34a60cde4665869 (patch) | |
tree | f269eee2221d89d7a3f6000f13c73a633ede9e30 /source/smbd | |
parent | 549b8bc455145e48e1d28cf6830f1835fac00619 (diff) | |
download | samba-836b6dcffa091b407b4e6120d34a60cde4665869.tar.gz samba-836b6dcffa091b407b4e6120d34a60cde4665869.tar.xz samba-836b6dcffa091b407b4e6120d34a60cde4665869.zip |
r6263: Get rid of generate_wellknown_sids, they are const static and initializable
statically.
Volker
Diffstat (limited to 'source/smbd')
-rw-r--r-- | source/smbd/nttrans.c | 1 | ||||
-rw-r--r-- | source/smbd/posix_acls.c | 11 |
2 files changed, 3 insertions, 9 deletions
diff --git a/source/smbd/nttrans.c b/source/smbd/nttrans.c index 69b83fe3da4..4dffe870c53 100644 --- a/source/smbd/nttrans.c +++ b/source/smbd/nttrans.c @@ -21,7 +21,6 @@ #include "includes.h" -extern DOM_SID global_sid_World; extern int max_send; extern enum protocol_types Protocol; extern int smb_read_error; diff --git a/source/smbd/posix_acls.c b/source/smbd/posix_acls.c index 31135f09071..e0d98f4b897 100644 --- a/source/smbd/posix_acls.c +++ b/source/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); |