[SCM] Samba Shared Repository - branch master updated

[Jeremy Allison]

The branch, master has been updated
       via  ccb39a3 tsocket: ENOMEM can be retried on illumos/Solaris.
      from  156fa6c vfstest: update the manual page

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


- Log -----------------------------------------------------------------
commit ccb39a3fd2144417aea0190ecc7fe3ed165c7cc8
Author: Ira Cooper <ira at samba.org>
Date:   Wed Mar 13 13:36:11 2013 +0000

    tsocket: ENOMEM can be retried on illumos/Solaris.
    
    The writev system call can return -1 and errno ENOMEM, as a
    retriable condition.
    
    Reviewed-by: Jeremy Allison <jra at samba.org>
    
    Autobuild-User(master): Jeremy Allison <jra at samba.org>
    Autobuild-Date(master): Wed Mar 13 23:50:05 CET 2013 on sn-devel-104

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

Summary of changes:
 lib/tsocket/tsocket_bsd.c |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)


Changeset truncated at 500 lines:

diff --git a/lib/tsocket/tsocket_bsd.c b/lib/tsocket/tsocket_bsd.c
index 4b54d31..89e5f4c 100644
--- a/lib/tsocket/tsocket_bsd.c
+++ b/lib/tsocket/tsocket_bsd.c
@@ -60,6 +60,12 @@ static int tsocket_bsd_error_from_errno(int ret,
 		return sys_errno;
 	}
 
+	/* ENOMEM is retryable on Solaris/illumos, and possibly other systems. */
+	if (sys_errno == ENOMEM) {
+		*retry = true;
+		return sys_errno;
+	}
+
 #ifdef EWOULDBLOCK
 	if (sys_errno == EWOULDBLOCK) {
 		*retry = true;


-- 
Samba Shared Repository