[SCM] Samba Shared Repository - branch master updated

[Jeremy Allison]

The branch, master has been updated
       via  d1a5a5b s3-linux-aio: Fix error handling
       via  254e8c4 Add debug message when SD hash doesn't match.
      from  2d1334e s3-autoconf: Fix the build.

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


- Log -----------------------------------------------------------------
commit d1a5a5bc80885270100f52ad4170987346e16ffc
Author: Volker Lendecke <vl at samba.org>
Date:   Tue Jul 17 17:26:42 2012 +0200

    s3-linux-aio: Fix error handling
    
    Signed-off-by: Jeremy Allison <jra at samba.org>
    
    Autobuild-User(master): Jeremy Allison <jra at samba.org>
    Autobuild-Date(master): Tue Jul 17 21:22:31 CEST 2012 on sn-devel-104

commit 254e8c46c432ec0540181a62ad71c08dd119e380
Author: Jeremy Allison <jra at samba.org>
Date:   Tue Jul 17 10:04:03 2012 -0700

    Add debug message when SD hash doesn't match.

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

Summary of changes:
 source3/modules/vfs_acl_common.c |    5 +++++
 source3/modules/vfs_aio_linux.c  |    6 ++----
 2 files changed, 7 insertions(+), 4 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/modules/vfs_acl_common.c b/source3/modules/vfs_acl_common.c
index c7bce57..a3d53a1 100644
--- a/source3/modules/vfs_acl_common.c
+++ b/source3/modules/vfs_acl_common.c
@@ -370,6 +370,11 @@ static NTSTATUS get_nt_acl_internal(vfs_handle_struct *handle,
 	}
 
 	/* Hash doesn't match, return underlying sd. */
+	DEBUG(10, ("get_nt_acl_internal: blob hash "
+		"does not match for file %s - returning "
+		"file system SD mapping.\n",
+		name ));
+
 	TALLOC_FREE(psd);
 	psd = pdesc_next;
 
diff --git a/source3/modules/vfs_aio_linux.c b/source3/modules/vfs_aio_linux.c
index d152f35..7b73942 100644
--- a/source3/modules/vfs_aio_linux.c
+++ b/source3/modules/vfs_aio_linux.c
@@ -288,11 +288,9 @@ static void aio_linux_setup_returns(struct io_event *ioev)
 {
 	struct aio_private_data *pd = (struct aio_private_data *)ioev->data;
 
-	/* ioev->res2 contains the -errno if error. */
-	/* ioev->res contains the number of bytes sent/received. */
-	if (ioev->res2) {
+	if (ioev->res < 0) {
 		pd->ret_size = -1;
-		pd->ret_errno = -ioev->res2;
+		pd->ret_errno = -ioev->res;
 	} else {
 		pd->ret_size = ioev->res;
 		pd->ret_errno = 0;


-- 
Samba Shared Repository