Attachment 7646 Details for Bug 8998 – git-am fix for 3.5.next.

[patch] git-am fix for 3.5.next.

0001-Fix-for-bug-8998-Notify-code-can-miss-a-ChDir.patch (text/plain), 2.30 KB, created by Jeremy Allison on 2012-06-14 19:09:32 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jeremy Allison

Created: 2012-06-14 19:09:32 UTC

Size: 2.30 KB

patch

obsolete

>From 6b0e82c9994ffb96a1f74781d9bd6218d0aed482 Mon Sep 17 00:00:00 2001
>From: Volker Lendecke <Volker.Lendecke@SerNet.DE>
>Date: Thu, 14 Jun 2012 12:07:33 -0700
>Subject: [PATCH] Fix for bug #8998 - Notify code can miss a ChDir.
>
>---
> source3/smbd/notify.c |   57 +++++++++++++++++++++++++++++++++++++-----------
> 1 files changed, 44 insertions(+), 13 deletions(-)
>
>diff --git a/source3/smbd/notify.c b/source3/smbd/notify.c
>index a53f3fb..345a50a 100644
>--- a/source3/smbd/notify.c
>+++ b/source3/smbd/notify.c
>@@ -366,28 +366,59 @@ void remove_pending_change_notify_requests_by_fid(files_struct *fsp,
> 	}
> }
> 
>+static void notify_parent_dir(connection_struct *conn,
>+				uint32 action, uint32 filter,
>+				const char *path)
>+{
>+	struct smb_filename smb_fname_parent;
>+	char *parent;
>+	const char *name;
>+	char *oldwd;
>+
>+	if (!parent_dirname(talloc_tos(), path, &parent, &name)) {
>+		DEBUG(1, ("Can't get parent dirname, giving up\n"));
>+		return;
>+	}
>+
>+	ZERO_STRUCT(smb_fname_parent);
>+	smb_fname_parent.base_name = parent;
>+
>+	oldwd = vfs_GetWd(parent, conn);
>+	if (oldwd == NULL) {
>+		DEBUG(1, ("vfs_GetWd failed!\n"));
>+		goto done;
>+	}
>+	if (vfs_ChDir(conn, conn->connectpath) == -1) {
>+		DEBUG(1, ("Could not chdir to connect path!\n"));
>+		goto done;
>+	}
>+
>+	if (SMB_VFS_STAT(conn, &smb_fname_parent) == -1) {
>+		goto chdir_done;
>+	}
>+
>+	notify_onelevel(conn->notify_ctx, action, filter,
>+			SMB_VFS_FILE_ID_CREATE(conn, &smb_fname_parent.st),
>+			name);
>+chdir_done:
>+	vfs_ChDir(conn, oldwd);
>+done:
>+	TALLOC_FREE(parent);
>+}
>+
> void notify_fname(connection_struct *conn, uint32 action, uint32 filter,
> 		  const char *path)
> {
>-	char *fullpath;
>+	char *fullpath = NULL;
> 	char *parent;
> 	const char *name;
>+	char *oldwd;
>+	struct smb_filename smb_fname_parent;
> 
> 	if (path[0] == '.' && path[1] == '/') {
> 		path += 2;
> 	}
>-	if (parent_dirname(talloc_tos(), path, &parent, &name)) {
>-		struct smb_filename smb_fname_parent;
>-
>-		ZERO_STRUCT(smb_fname_parent);
>-		smb_fname_parent.base_name = parent;
>-
>-		if (SMB_VFS_STAT(conn, &smb_fname_parent) != -1) {
>-			notify_onelevel(conn->notify_ctx, action, filter,
>-			    SMB_VFS_FILE_ID_CREATE(conn, &smb_fname_parent.st),
>-			    name);
>-		}
>-	}
>+	notify_parent_dir(conn, action, filter, path);
> 
> 	fullpath = talloc_asprintf(talloc_tos(), "%s/%s", conn->connectpath,
> 				   path);
>-- 
>1.7.7.3
>

Flags:

vl: review-

Actions: View

Attachments on bug 8998: 7645 | 7646 | 7650