Attachment 11831 Details for Bug 11727 – Patch for v4-2-test

[patch] Patch for v4-2-test

skip-dos-v4-2-test.patch (text/plain), 1.30 KB, created by José A. Rivera on 2016-02-11 18:52:15 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: José A. Rivera

Created: 2016-02-11 18:52:15 UTC

Size: 1.30 KB

patch

obsolete

>From aaab41fed8b3272e3079a06f2112e3781dfd0107 Mon Sep 17 00:00:00 2001
>From: "Jose A. Rivera" <jarrpa@samba.org>
>Date: Wed, 3 Feb 2016 20:58:19 -0600
>Subject: [PATCH] s3:smbd:open: Skip redundant call to file_set_dosmode when
> creating a new file.
>
>BUG: https://bugzilla.samba.org/attachment.cgi?id=11820
>
>Signed-off-by: Jose A. Rivera <jarrpa@samba.org>
>Pair-programmed-with: Ira Cooper <ira@samba.org>
>Reviewed-by: Jeremy Allison <jra@samba.org>
>
>Autobuild-User(master): Jeremy Allison <jra@samba.org>
>Autobuild-Date(master): Fri Feb  5 04:37:43 CET 2016 on sn-devel-144
>
>(cherry picked from commit aec07b8b60ff9589a3c84eef6adeca464e6c01f6)
>---
> source3/smbd/open.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
>diff --git a/source3/smbd/open.c b/source3/smbd/open.c
>index 5dbb0a5..eb4323a 100644
>--- a/source3/smbd/open.c
>+++ b/source3/smbd/open.c
>@@ -3166,8 +3166,8 @@ static NTSTATUS open_file_ntcreate(connection_struct *conn,
> 	}
> 
> 	if (info != FILE_WAS_OPENED) {
>-		/* Files should be initially set as archive */
>-		if (lp_map_archive(SNUM(conn)) ||
>+		/* Overwritten files should be initially set as archive */
>+		if ((info == FILE_WAS_OVERWRITTEN && lp_map_archive(SNUM(conn))) ||
> 		    lp_store_dos_attributes(SNUM(conn))) {
> 			if (!posix_open) {
> 				if (file_set_dosmode(conn, smb_fname,
>-- 
>2.5.0
>

Actions: View

Attachments on bug 11727: 11818 | 11819 | 11820 | 11831 | 11832 | 11833 | 11834