[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha6-637-gb8cafc5

[Kai Blin]

The branch, master has been updated
       via  b8cafc5ad21fa999ce52facf605b3c315edde322 (commit)
      from  1bf51ea26293120a63e445e07b08ddf718487900 (commit)

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


- Log -----------------------------------------------------------------
commit b8cafc5ad21fa999ce52facf605b3c315edde322
Author: Kai Blin <kai at samba.org>
Date:   Mon Feb 9 12:11:43 2009 +0100

    async_sock: Map ASYNC_REQ_TIMEOUT to ETIMEDOUT instead of ETIME
    
    Also, fall back to EIO if ETIMEDOUT is not present

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

Summary of changes:
 lib/async_req/async_sock.c |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/lib/async_req/async_sock.c b/lib/async_req/async_sock.c
index 23ac937..46ad29d 100644
--- a/lib/async_req/async_sock.c
+++ b/lib/async_req/async_sock.c
@@ -116,7 +116,11 @@ bool async_req_is_errno(struct async_req *req, int *err)
 		*err = (int)error;
 		break;
 	case ASYNC_REQ_TIMED_OUT:
-		*err = ETIME;
+#ifdef HAVE_ETIMEDOUT
+		*err = ETIMEDOUT;
+#else
+		*err = EIO;
+#endif
 		break;
 	case ASYNC_REQ_NO_MEMORY:
 		*err = ENOMEM;


-- 
Samba Shared Repository