Attachment 11616 Details for Bug 11065 – git-am fix for 4.3.next, 4.2.next.

[patch] git-am fix for 4.3.next, 4.2.next.

bug-11065 (text/plain), 3.82 KB, created by Jeremy Allison on 2015-11-24 23:32:18 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jeremy Allison

Created: 2015-11-24 23:32:18 UTC

Size: 3.82 KB

patch

obsolete

>From a7916f395305afb980fd5c15d2c60a89dab2ea1f Mon Sep 17 00:00:00 2001
>From: Jeremy Allison <jra@samba.org>
>Date: Mon, 23 Nov 2015 11:27:56 -0800
>Subject: [PATCH 1/2] s3: smbd: Change semantics of strict rename to search the
> file open db.
>
>Without strict rename just look in local process. POSIX renames are
>already dealt with above.
>
>Documentation change to follow.
>
>BUG: https://bugzilla.samba.org/show_bug.cgi?id=11065
>
>Signed-off-by: Jeremy Allison <jra@samba.org>
>---
> source3/smbd/dir.c   |  2 +-
> source3/smbd/proto.h |  2 ++
> source3/smbd/reply.c | 12 +++++++++++-
> 3 files changed, 14 insertions(+), 2 deletions(-)
>
>diff --git a/source3/smbd/dir.c b/source3/smbd/dir.c
>index cfc1635..4c77559 100644
>--- a/source3/smbd/dir.c
>+++ b/source3/smbd/dir.c
>@@ -1963,7 +1963,7 @@ static int have_file_open_below_fn(struct file_id fid,
> 	return 1;
> }
> 
>-static bool have_file_open_below(connection_struct *conn,
>+bool have_file_open_below(connection_struct *conn,
> 				 const struct smb_filename *name)
> {
> 	struct have_file_open_below_state state = {};
>diff --git a/source3/smbd/proto.h b/source3/smbd/proto.h
>index be51182..55e8286 100644
>--- a/source3/smbd/proto.h
>+++ b/source3/smbd/proto.h
>@@ -232,6 +232,8 @@ long TellDir(struct smb_Dir *dirp);
> bool SearchDir(struct smb_Dir *dirp, const char *name, long *poffset);
> NTSTATUS can_delete_directory(struct connection_struct *conn,
> 				const char *dirname);
>+bool have_file_open_below(connection_struct *conn,
>+			const struct smb_filename *name);
> 
> /* The following definitions come from smbd/dmapi.c  */
> 
>diff --git a/source3/smbd/reply.c b/source3/smbd/reply.c
>index c437135..efef613 100644
>--- a/source3/smbd/reply.c
>+++ b/source3/smbd/reply.c
>@@ -2676,7 +2676,17 @@ static NTSTATUS can_rename(connection_struct *conn, files_struct *fsp,
> 		/* If no pathnames are open below this
> 		   directory, allow the rename. */
> 
>-		if (file_find_subpath(fsp)) {
>+		if (lp_strict_rename(SNUM(conn))) {
>+			/*
>+			 * Strict rename, check open file db.
>+			 */
>+			if (have_file_open_below(fsp->conn, fsp->fsp_name)) {
>+				return NT_STATUS_ACCESS_DENIED;
>+			}
>+		} else if (file_find_subpath(fsp)) {
>+			/*
>+			 * No strict rename, just look in local process.
>+			 */
> 			return NT_STATUS_ACCESS_DENIED;
> 		}
> 		return NT_STATUS_OK;
>-- 
>2.6.0.rc2.230.g3dd15c0
>
>
>From 25a6ca7c3218c449272dae23c34ae0df06ee939f Mon Sep 17 00:00:00 2001
>From: Jeremy Allison <jra@samba.org>
>Date: Mon, 23 Nov 2015 11:32:48 -0800
>Subject: [PATCH 2/2] s3: docs: Fix "strict rename" doc to match code.
>
>BUG: https://bugzilla.samba.org/show_bug.cgi?id=11065
>
>Signed-off-by: Jeremy Allison <jra@samba.org>
>---
> docs-xml/smbdotconf/tuning/strictrename.xml | 13 ++++++++++---
> 1 file changed, 10 insertions(+), 3 deletions(-)
>
>diff --git a/docs-xml/smbdotconf/tuning/strictrename.xml b/docs-xml/smbdotconf/tuning/strictrename.xml
>index 5478863..0fe3385 100644
>--- a/docs-xml/smbdotconf/tuning/strictrename.xml
>+++ b/docs-xml/smbdotconf/tuning/strictrename.xml
>@@ -15,10 +15,17 @@
>     Samba system the cost is even greater than the non-clustered
>     case.</para>
> 
>-    <para>For this reason the default is "no", and it is recommended
>-    to be left that way unless a specific Windows application requires
>-    it to be changed.</para>
>+    <para>When set to "no" smbd only checks the local process
>+    the client is attached to for open files below a directory
>+    being renames, and doesn't search the open file database.</para>
> 
>+    <para>Because of the expense in fully searching the database,
>+    the default is "no", and it is recommended to be left that way
>+    unless a specific Windows application requires it to be changed.</para>
>+
>+    <para>If the client has requested UNIX extensions (POSIX
>+    pathnames) then renames are always allowed and this parameter
>+    has no effect.</para>
> </description>
> 
> <value type="default">no</value>
>-- 
>2.6.0.rc2.230.g3dd15c0
>

Flags:

slow: review+
jra: review? (obnox)

Actions: View

Attachments on bug 11065: 10646 | 10647 | 10648 | 10652 | 11616 | 11668 | 11669 | 12186