[SCM] Samba Shared Repository - branch v3-6-test updated

[Stefan Metzmacher]

The branch, v3-6-test has been updated
       via  42ad763 s3-modules: Fix debug message
       via  7f14129 release-scripts/create-tarball: also remove the toplevel configure.developer
      from  4356488 create-tarball: Remove toplevel Makefile and configure.

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


- Log -----------------------------------------------------------------
commit 42ad7630259829f1c40d9d0fcf5376fa007568a3
Author: Björn Baumbach <bb at sernet.de>
Date:   Mon Apr 11 10:27:58 2011 +0200

    s3-modules: Fix debug message
    
    Print child descriptor instead of parent.
    
    Signed-off-by: Stefan Metzmacher <metze at samba.org>
    
    Autobuild-User: Stefan Metzmacher <metze at samba.org>
    Autobuild-Date: Mon Apr 11 11:48:42 CEST 2011 on sn-devel-104
    (cherry picked from commit e6cf92c574fba14132757f141d8b1242fa71be88)

commit 7f14129570fe5c61c8eae9550e725e924cb12db4
Author: Stefan Metzmacher <metze at samba.org>
Date:   Mon Apr 11 11:54:21 2011 +0200

    release-scripts/create-tarball: also remove the toplevel configure.developer
    
    metze

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

Summary of changes:
 release-scripts/create-tarball   |    2 +-
 source3/modules/vfs_acl_common.c |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/release-scripts/create-tarball b/release-scripts/create-tarball
index d634f2b..4eec87b 100755
--- a/release-scripts/create-tarball
+++ b/release-scripts/create-tarball
@@ -220,7 +220,7 @@ function main
 	/bin/rm -f source4/ldap_server/devdocs/ldapext-ldapv3-vlv-04.txt
     fi
 
-    /bin/rm -f Makefile configure
+    /bin/rm -f Makefile configure configure.developer
 
     packaging/bin/update-pkginfo ${version} 1 ""
 
diff --git a/source3/modules/vfs_acl_common.c b/source3/modules/vfs_acl_common.c
index f8265c5..99edbda 100644
--- a/source3/modules/vfs_acl_common.c
+++ b/source3/modules/vfs_acl_common.c
@@ -474,7 +474,7 @@ static NTSTATUS inherit_new_acl(vfs_handle_struct *handle,
 	if (DEBUGLEVEL >= 10) {
 		DEBUG(10,("inherit_new_acl: child acl for %s is:\n",
 			fsp_str_dbg(fsp) ));
-		NDR_PRINT_DEBUG(security_descriptor, parent_desc);
+		NDR_PRINT_DEBUG(security_descriptor, psd);
 	}
 
 	return SMB_VFS_FSET_NT_ACL(fsp,


-- 
Samba Shared Repository