From f124d6fbcd0a03bbd95d69477c144f475546de66 Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Wed, 21 Aug 2013 12:03:25 -0700 Subject: Fix the erroneous masking of chmod requests via the UNIX extensions. Signed-off-by: Jeremy Allison --- source3/smbd/trans2.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'source3') diff --git a/source3/smbd/trans2.c b/source3/smbd/trans2.c index e7c0da1c20..bafd3f76dd 100644 --- a/source3/smbd/trans2.c +++ b/source3/smbd/trans2.c @@ -1392,20 +1392,15 @@ static NTSTATUS unix_perms_from_wire( connection_struct *conn, ret |= ((perms & UNIX_SET_UID ) ? S_ISUID : 0); #endif - switch (ptype) { - case PERM_NEW_FILE: - case PERM_EXISTING_FILE: + if (ptype == PERM_NEW_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: + } else if (ptype == PERM_NEW_DIR) { ret &= lp_dir_mask(SNUM(conn)); /* Add in force bits */ ret |= lp_force_dir_mode(SNUM(conn)); - break; } *ret_perms = ret; -- cgit