From 8503eecabb9cbd47db6167f7394dc2257714ebd9 Mon Sep 17 00:00:00 2001
From: Volker Lendecke <vl@samba.org>
Date: Thu, 15 Mar 2012 13:02:15 +0100
Subject: s3-notify: Lift "/." handling up one level

This slightly simplifies the code

Autobuild-User: Volker Lendecke <vl@samba.org>
Autobuild-Date: Fri Mar 16 14:28:44 CET 2012 on sn-devel-104
---
 source3/smbd/notify.c          |  9 +++++++++
 source3/smbd/notify_internal.c | 15 ---------------
 2 files changed, 9 insertions(+), 15 deletions(-)

(limited to 'source3/smbd')

diff --git a/source3/smbd/notify.c b/source3/smbd/notify.c
index 37d585b896..534ed8477b 100644
--- a/source3/smbd/notify.c
+++ b/source3/smbd/notify.c
@@ -178,6 +178,7 @@ NTSTATUS change_notify_create(struct files_struct *fsp, uint32 filter,
 			      bool recursive)
 {
 	char *fullpath;
+	size_t len;
 	struct notify_entry e;
 	NTSTATUS status;
 
@@ -202,6 +203,14 @@ NTSTATUS change_notify_create(struct files_struct *fsp, uint32 filter,
 		return NT_STATUS_NO_MEMORY;
 	}
 
+	/*
+	 * Avoid /. at the end of the path name. notify can't deal with it.
+	 */
+	len = strlen(fullpath);
+	if (len > 1 && fullpath[len-1] == '.' && fullpath[len-2] == '/') {
+		fullpath[len-2] = '\0';
+	}
+
 	ZERO_STRUCT(e);
 	e.path = fullpath;
 	e.dir_fd = fsp->fh->fd;
diff --git a/source3/smbd/notify_internal.c b/source3/smbd/notify_internal.c
index 599c994169..906f7674de 100644
--- a/source3/smbd/notify_internal.c
+++ b/source3/smbd/notify_internal.c
@@ -511,9 +511,7 @@ NTSTATUS notify_add(struct notify_context *notify, struct notify_entry *e0,
 {
 	struct notify_entry e = *e0;
 	NTSTATUS status;
-	char *tmp_path = NULL;
 	struct notify_list *listel;
-	size_t len;
 	int depth;
 
 	/* see if change notify is enabled at all */
@@ -521,17 +519,6 @@ NTSTATUS notify_add(struct notify_context *notify, struct notify_entry *e0,
 		return NT_STATUS_NOT_IMPLEMENTED;
 	}
 
-	/* cope with /. on the end of the path */
-	len = strlen(e.path);
-	if (len > 1 && e.path[len-1] == '.' && e.path[len-2] == '/') {
-		tmp_path = talloc_strndup(notify, e.path, len-2);
-		if (tmp_path == NULL) {
-			status = NT_STATUS_NO_MEMORY;
-			goto done;
-		}
-		e.path = tmp_path;
-	}
-
 	depth = count_chars(e.path, '/');
 
 	listel = talloc_zero(notify, struct notify_list);
@@ -586,8 +573,6 @@ NTSTATUS notify_add(struct notify_context *notify, struct notify_entry *e0,
 	}
 	status = NT_STATUS_OK;
 done:
-	talloc_free(tmp_path);
-
 	return status;
 }
 
-- 
cgit