[SCM] Samba Shared Repository - branch v3-4-stable updated - release-3-4-0rc1-25-g92bc5b1

[Karolin Seeger]

The branch, v3-4-stable has been updated
       via  92bc5b1f8d3bd5629cd733875eeaabd5561585fb (commit)
       via  91472d08a7d01d223ef4b7a274a07f6aa6579337 (commit)
      from  e51f114a6efa3d22f21837b55692285b3f83240e (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-4-stable


- Log -----------------------------------------------------------------
commit 92bc5b1f8d3bd5629cd733875eeaabd5561585fb
Author: Karolin Seeger <kseeger at samba.org>
Date:   Fri Jul 3 09:47:32 2009 +0200

    WHATSNEW: Update changes.
    
    Karolin
    (cherry picked from commit ebe56e6872228fcbd81ead598eb2c5b1738b7f4c)

commit 91472d08a7d01d223ef4b7a274a07f6aa6579337
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
    (cherry picked from commit a14efbadd53ac9678d75e6029f947d63cfa0c4e5)
    
    Signed-off-by: Stefan Metzmacher <metze at samba.org>
    
    This addresses bug #6526.
    (cherry picked from commit 8446843ec43cd61e548dda7032f26020240d872d)

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

Summary of changes:
 WHATSNEW.txt       |    4 ++++
 source3/lib/util.c |    2 +-
 2 files changed, 5 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/WHATSNEW.txt b/WHATSNEW.txt
index 27f161c..68c8b9e 100644
--- a/WHATSNEW.txt
+++ b/WHATSNEW.txt
@@ -237,6 +237,10 @@ o    Jim McDonough <jmcd at samba.org>
        not.
 
 
+o    Stefan Metzmacher <metze at samba.org>
+     * BUG 6526: Fix notifies in the share root directory.
+
+
 o    Bo Yang <boyang at samba.org>
      * BUG 6499: Fix building of pam_smbpass.
 
diff --git a/source3/lib/util.c b/source3/lib/util.c
index 822b0cf..61a73e6 100644
--- a/source3/lib/util.c
+++ b/source3/lib/util.c
@@ -2336,7 +2336,7 @@ bool parent_dirname(TALLOC_CTX *mem_ctx, const char *dir, char **parent,
 			return False;
 		}
 		if (name) {
-			*name = "";
+			*name = dir;
 		}
 		return True;
 	}


-- 
Samba Shared Repository