Changeset 232 for branches/samba-3.2.x/source/libsmb/clientgen.c

Timestamp:

May 27, 2009, 9:09:42 AM (16 years ago)

Author:

Herwig Bauernfeind

Message:

Update 3.2 branch to 3.2.8

File:

• branches/samba-3.2.x/source/libsmb/clientgen.c (modified) (2 diffs)

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

@@ -316 +316 @@
         size_t len = SVAL(cli->outbuf,smb_vwv11) + 4;
         size_t nwritten=0;
-        ssize_t ret;
+        struct iovec iov[2];
 
         /* fd == -1 causes segfaults -- Tom (tom@ninja.nl) */
@@ -328 +328 @@
         }
 
-        while (nwritten < len) {
-                ret = write_socket(cli->fd,cli->outbuf+nwritten,len - nwritten);
-                if (ret <= 0) {
-                        close(cli->fd);
-                        cli->fd = -1;
-                        cli->smb_rw_error = SMB_WRITE_ERROR;
-                        DEBUG(0,("Error writing %d bytes to client. %d (%s)\n",
-                                (int)len,(int)ret, strerror(errno) ));
-                        return false;
-                }
-                nwritten += ret;
-        }
-
-        /* Now write the extra data. */
-        nwritten=0;
-        while (nwritten < extradata) {
-                ret = write_socket(cli->fd,p+nwritten,extradata - nwritten);
-                if (ret <= 0) {
-                        close(cli->fd);
-                        cli->fd = -1;
-                        cli->smb_rw_error = SMB_WRITE_ERROR;
-                        DEBUG(0,("Error writing %d extradata "
-                                "bytes to client. %d (%s)\n",
-                                (int)extradata,(int)ret, strerror(errno) ));
-                        return false;
-                }
-                nwritten += ret;
+        iov[0].iov_base = cli->outbuf;
+        iov[0].iov_len = len;
+        iov[1].iov_base = CONST_DISCARD(char *, p);
+        iov[1].iov_len = extradata;
+
+        nwritten = write_data_iov(cli->fd, iov, 2);
+        if (nwritten < (len + extradata)) {
+                close(cli->fd);
+                cli->fd = -1;
+                cli->smb_rw_error = SMB_WRITE_ERROR;
+                DEBUG(0,("Error writing %d bytes to client. (%s)\n",
+                         (int)(len+extradata), strerror(errno)));
+                return false;
         }