s3: Remove smbd_server_fd() from construct_reply
authorVolker Lendecke <vl@samba.org>
Sun, 15 Aug 2010 09:33:05 +0000 (11:33 +0200)
committerVolker Lendecke <vl@samba.org>
Mon, 16 Aug 2010 20:39:24 +0000 (22:39 +0200)
source3/smbd/process.c

index c3240e806d3ace929f7433506dd8971876cb8a65..0ec5adf684f068b515db92e8646973e793518b4a 100644 (file)
@@ -1571,7 +1571,7 @@ static void construct_reply(char *inbuf, int size, size_t unread_bytes,
 
        if (req->unread_bytes) {
                /* writeX failed. drain socket. */
-               if (drain_socket(smbd_server_fd(), req->unread_bytes) !=
+               if (drain_socket(req->sconn->sock, req->unread_bytes) !=
                                req->unread_bytes) {
                        smb_panic("failed to drain pending bytes");
                }
@@ -1591,7 +1591,7 @@ static void construct_reply(char *inbuf, int size, size_t unread_bytes,
                show_msg((char *)req->outbuf);
        }
 
-       if (!srv_send_smb(smbd_server_fd(),
+       if (!srv_send_smb(req->sconn->sock,
                        (char *)req->outbuf,
                        true, req->seqnum+1,
                        IS_CONN_ENCRYPTED(conn)||req->encrypted,