Changeset 596 for trunk/server/source3/smbd/process.c

Timestamp:

Jul 2, 2011, 3:35:33 PM (14 years ago)

Author:

Herwig Bauernfeind

Message:

Samba 3.5: Update trunk to 3.5.8

File:

• trunk/server/source3/smbd/process.c (modified) (2 diffs)

trunk/server/source3/smbd/process.c

@@ -836 +836 @@
                 END_PROFILE(smbd_idle);
                 errno = sav;
+        }
+
+        if (selrtn == -1 && errno != EINTR) {
+                return map_nt_error_from_unix(errno);
         }
 
@@ -1857 +1861 @@
                  * may have updated them.
                  */
-                SCVAL(req->chain_outbuf, smb_tid, CVAL(req->outbuf, smb_tid));
-                SCVAL(req->chain_outbuf, smb_uid, CVAL(req->outbuf, smb_uid));
+                SSVAL(req->chain_outbuf, smb_tid, SVAL(req->outbuf, smb_tid));
+                SSVAL(req->chain_outbuf, smb_uid, SVAL(req->outbuf, smb_uid));
 
                 if (!smb_splice_chain(&req->chain_outbuf,