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

[Karolin Seeger]

The branch, v3-5-test has been updated
       via  75ab0c4 s3-modules: Fix debug message (bug #8074)
      from  84745fe Fix bug #6762 - ctdb on gpfs error with MS Office.

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


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

    s3-modules: Fix debug message (bug #8074)
    
    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)
    (cherry picked from commit 42ad7630259829f1c40d9d0fcf5376fa007568a3)

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

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


Changeset truncated at 500 lines:

diff --git a/source3/modules/vfs_acl_common.c b/source3/modules/vfs_acl_common.c
index f1884f5..eee322d 100644
--- a/source3/modules/vfs_acl_common.c
+++ b/source3/modules/vfs_acl_common.c
@@ -469,7 +469,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