From: Volker Lendecke <Volker.Lendecke@SerNet.DE>
Date: Thu, 14 Jun 2012 18:26:44 +0000 (-0700)
Subject: Part 2 of fix for bug #8998 - Notify code can miss a ChDir.
X-Git-Url: http://git.samba.org/?p=ddiss%2Fsamba.git;a=commitdiff_plain;h=0ace3ca03df76a1c22e112ea41d491f90afc0f94

Part 2 of fix for bug #8998 - Notify code can miss a ChDir.

Do a ChDir for notify_onelevel.
---

diff --git a/source3/smbd/notify.c b/source3/smbd/notify.c
index 436a3543901..d9a28eb6983 100644
--- a/source3/smbd/notify.c
+++ b/source3/smbd/notify.c
@@ -352,6 +352,7 @@ static void notify_parent_dir(connection_struct *conn,
 	struct smb_filename smb_fname_parent;
 	char *parent;
 	const char *name;
+	char *oldwd;
 
 	if (!parent_dirname(talloc_tos(), path, &parent, &name)) {
 		return;
@@ -360,12 +361,23 @@ static void notify_parent_dir(connection_struct *conn,
 	ZERO_STRUCT(smb_fname_parent);
 	smb_fname_parent.base_name = parent;
 
-	if (SMB_VFS_STAT(conn, &smb_fname_parent) == -1) {
+	oldwd = vfs_GetWd(parent, conn);
+	if (oldwd == NULL) {
+		goto done;
+	}
+	if (vfs_ChDir(conn, conn->connectpath) == -1) {
 		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);
 }