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/trans2.c | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) (limited to 'source3/smbd/trans2.c') diff --git a/source3/smbd/trans2.c b/source3/smbd/trans2.c index d108ee6243..44c457cae5 100644 --- a/source3/smbd/trans2.c +++ b/source3/smbd/trans2.c @@ -1365,28 +1365,18 @@ static NTSTATUS unix_perms_from_wire( connection_struct *conn, switch (ptype) { case PERM_NEW_FILE: + case PERM_EXISTING_FILE: /* Apply mode mask */ ret &= lp_create_mask(SNUM(conn)); /* Add in force bits */ ret |= lp_force_create_mode(SNUM(conn)); break; case PERM_NEW_DIR: + case PERM_EXISTING_DIR: ret &= lp_dir_mask(SNUM(conn)); /* Add in force bits */ ret |= lp_force_dir_mode(SNUM(conn)); break; - case PERM_EXISTING_FILE: - /* Apply mode mask */ - ret &= lp_security_mask(SNUM(conn)); - /* Add in force bits */ - ret |= lp_force_security_mode(SNUM(conn)); - break; - case PERM_EXISTING_DIR: - /* Apply mode mask */ - ret &= lp_dir_security_mask(SNUM(conn)); - /* Add in force bits */ - ret |= lp_force_dir_security_mode(SNUM(conn)); - break; } *ret_perms = ret; -- cgit