[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha8-163-ga14efba

[Stefan Metzmacher]

The branch, master has been updated
       via  a14efbadd53ac9678d75e6029f947d63cfa0c4e5 (commit)
       via  b292af0c38c6aa2167adb5803ced03cf51a81a9c (commit)
       via  c229239ea4799bb18973d4bdcb4cb499043d6f15 (commit)
      from  dd118bf219de03d63412ec32f78f36105a866375 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit a14efbadd53ac9678d75e6029f947d63cfa0c4e5
Author: Stefan Metzmacher <metze at samba.org>
Date:   Tue Jun 30 16:03:11 2009 +0200

    s3:util: let parent_dirname() correctly return toplevel filenames
    
    metze

commit b292af0c38c6aa2167adb5803ced03cf51a81a9c
Author: Stefan Metzmacher <metze at samba.org>
Date:   Wed Jul 1 12:50:00 2009 +0200

    s3:onefs_open: remove unused variable passed to parent_dirname()
    
    metze

commit c229239ea4799bb18973d4bdcb4cb499043d6f15
Author: Stefan Metzmacher <metze at samba.org>
Date:   Wed Jul 1 12:49:06 2009 +0200

    s3:smbd: remove unused variables passed to parent_dirname()
    
    metze

-----------------------------------------------------------------------

Summary of changes:
 source3/lib/util.c           |    2 +-
 source3/modules/onefs_open.c |    3 +--
 source3/smbd/open.c          |    3 +--
 source3/smbd/reply.c         |    5 ++---
 4 files changed, 5 insertions(+), 8 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/lib/util.c b/source3/lib/util.c
index c0bb042..77af939 100644
--- a/source3/lib/util.c
+++ b/source3/lib/util.c
@@ -2285,7 +2285,7 @@ bool parent_dirname(TALLOC_CTX *mem_ctx, const char *dir, char **parent,
 			return False;
 		}
 		if (name) {
-			*name = "";
+			*name = dir;
 		}
 		return True;
 	}
diff --git a/source3/modules/onefs_open.c b/source3/modules/onefs_open.c
index 5aade2c..da7d413 100644
--- a/source3/modules/onefs_open.c
+++ b/source3/modules/onefs_open.c
@@ -1370,7 +1370,6 @@ static NTSTATUS onefs_open_directory(connection_struct *conn,
 	struct timespec mtimespec;
 	int info = 0;
 	char *parent_dir;
-	const char *dirname;
 	bool posix_open = false;
 	uint32 create_flags = 0;
 	uint32 mode = lp_dir_mask(SNUM(conn));
@@ -1436,7 +1435,7 @@ static NTSTATUS onefs_open_directory(connection_struct *conn,
 
 	/* Get parent dirname */
 	if (!parent_dirname(talloc_tos(), smb_dname->base_name, &parent_dir,
-			    &dirname)) {
+			    NULL)) {
 		return NT_STATUS_NO_MEMORY;
 	}
 
diff --git a/source3/smbd/open.c b/source3/smbd/open.c
index a8dcef1..21e5804 100644
--- a/source3/smbd/open.c
+++ b/source3/smbd/open.c
@@ -2344,7 +2344,6 @@ static NTSTATUS mkdir_internal(connection_struct *conn,
 {
 	mode_t mode;
 	char *parent_dir;
-	const char *dirname;
 	NTSTATUS status;
 	bool posix_open = false;
 
@@ -2359,7 +2358,7 @@ static NTSTATUS mkdir_internal(connection_struct *conn,
 		return status;
 	}
 
-	if (!parent_dirname(talloc_tos(), name, &parent_dir, &dirname)) {
+	if (!parent_dirname(talloc_tos(), name, &parent_dir, NULL)) {
 		return NT_STATUS_NO_MEMORY;
 	}
 
diff --git a/source3/smbd/reply.c b/source3/smbd/reply.c
index 8cc865e..eb3bfe5 100644
--- a/source3/smbd/reply.c
+++ b/source3/smbd/reply.c
@@ -5697,14 +5697,13 @@ static void notify_rename(connection_struct *conn, bool is_dir,
 			  const char *oldpath, const char *newpath)
 {
 	char *olddir, *newdir;
-	const char *oldname, *newname;
 	uint32 mask;
 
 	mask = is_dir ? FILE_NOTIFY_CHANGE_DIR_NAME
 		: FILE_NOTIFY_CHANGE_FILE_NAME;
 
-	if (!parent_dirname(talloc_tos(), oldpath, &olddir, &oldname)
-	    || !parent_dirname(talloc_tos(), newpath, &newdir, &newname)) {
+	if (!parent_dirname(talloc_tos(), oldpath, &olddir, NULL)
+	    || !parent_dirname(talloc_tos(), newpath, &newdir, NULL)) {
 		TALLOC_FREE(olddir);
 		return;
 	}


-- 
Samba Shared Repository