From 7622aa16adeb00bf161a6dd07664c37125391272 Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Wed, 3 Oct 2012 14:49:01 -0700 Subject: Remove all uses of lp_security_mask/lp_force_security_mode/lp_dir_security_mask/lp_force_dir_security_mode and replace with the normal masks. Now these parameters can be removed. --- source3/smbd/posix_acls.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'source3/smbd/posix_acls.c') diff --git a/source3/smbd/posix_acls.c b/source3/smbd/posix_acls.c index b00f1ec1bc..503727fb99 100644 --- a/source3/smbd/posix_acls.c +++ b/source3/smbd/posix_acls.c @@ -1270,11 +1270,11 @@ static void apply_default_perms(const struct share_params *params, /* Get the initial bits to apply. */ if (is_directory) { - and_bits = lp_dir_security_mask(params->service); - or_bits = lp_force_dir_security_mode(params->service); + and_bits = lp_dir_mask(params->service); + or_bits = lp_force_dir_mode(params->service); } else { - and_bits = lp_security_mask(params->service); - or_bits = lp_force_security_mode(params->service); + and_bits = lp_create_mask(params->service); + or_bits = lp_force_create_mode(params->service); } /* Now bounce them into the S_USR space. */ @@ -3185,11 +3185,11 @@ static bool convert_canon_ace_to_posix_perms( files_struct *fsp, canon_ace *file /* Get the initial bits to apply. */ if (fsp->is_directory) { - and_bits = lp_dir_security_mask(snum); - or_bits = lp_force_dir_security_mode(snum); + and_bits = lp_dir_mask(snum); + or_bits = lp_force_dir_mode(snum); } else { - and_bits = lp_security_mask(snum); - or_bits = lp_force_security_mode(snum); + and_bits = lp_create_mask(snum); + or_bits = lp_force_create_mode(snum); } *posix_perms = (((*posix_perms) & and_bits)|or_bits); -- cgit