Changeset 204 for branches/samba-3.2.x/source/libsmb/async_smb.c

Timestamp:

May 20, 2009, 6:46:53 PM (16 years ago)

Author:

Herwig Bauernfeind

Message:

Update 3.2 branch to 3.2.4

File:

• branches/samba-3.2.x/source/libsmb/async_smb.c (modified) (8 diffs)

branches/samba-3.2.x/source/libsmb/async_smb.c

@@ -320 +320 @@
         struct cli_state *cli = (struct cli_state *)p;
         struct cli_request *req;
+        NTSTATUS status;
 
         DEBUG(11, ("cli_state_handler called with flags %d\n", flags));
@@ -332 +333 @@
                         DEBUG(10, ("ioctl(FIONREAD) failed: %s\n",
                                    strerror(errno)));
+                        status = map_nt_error_from_unix(errno);
                         goto sock_error;
                 }
@@ -337 +339 @@
                 if (available == 0) {
                         /* EOF */
+                        status = NT_STATUS_END_OF_FILE;
                         goto sock_error;
                 }
@@ -345 +348 @@
                 if (new_size < old_size) {
                         /* wrap */
+                        status = NT_STATUS_UNEXPECTED_IO_ERROR;
                         goto sock_error;
                 }
@@ -352 +356 @@
                 if (tmp == NULL) {
                         /* nomem */
+                        status = NT_STATUS_NO_MEMORY;
                         goto sock_error;
                 }
@@ -359 +364 @@
                 if (res == -1) {
                         DEBUG(10, ("recv failed: %s\n", strerror(errno)));
+                        status = map_nt_error_from_unix(errno);
                         goto sock_error;
                 }
@@ -403 +409 @@
 
                 if (sent < 0) {
+                        status = map_nt_error_from_unix(errno);
                         goto sock_error;
                 }
@@ -416 +423 @@
  sock_error:
         for (req = cli->outstanding_requests; req; req = req->next) {
-                req->async->state = ASYNC_REQ_ERROR;
-                req->async->status = map_nt_error_from_unix(errno);
+                async_req_error(req->async, status);
         }
         TALLOC_FREE(cli->fd_event);