summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVolker Lendecke <vl@samba.org>2010-08-14 23:13:11 +0200
committerVolker Lendecke <vl@samba.org>2010-08-16 22:39:17 +0200
commit50b3ee57e2860c4074de356a45f9d54a3236f3e8 (patch)
tree9f46fec50989040f2421ce90d125cd3e122f0e91
parent0e12c216dcf2fccccd6b38dfbe532bfa2593ae79 (diff)
downloadsamba-50b3ee57e2860c4074de356a45f9d54a3236f3e8.tar.gz
samba-50b3ee57e2860c4074de356a45f9d54a3236f3e8.tar.bz2
samba-50b3ee57e2860c4074de356a45f9d54a3236f3e8.zip
s3: Remove smbd_server_fd from smbd_initialize_smb2
-rw-r--r--source3/smbd/smb2_server.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/source3/smbd/smb2_server.c b/source3/smbd/smb2_server.c
index e60472801d..6db50f9ff9 100644
--- a/source3/smbd/smb2_server.c
+++ b/source3/smbd/smb2_server.c
@@ -111,7 +111,7 @@ static NTSTATUS smbd_initialize_smb2(struct smbd_server_connection *sconn)
sconn->smb2.sessions.limit = 0x0000FFFE;
sconn->smb2.sessions.list = NULL;
- ret = tstream_bsd_existing_socket(sconn, smbd_server_fd(),
+ ret = tstream_bsd_existing_socket(sconn, sconn->sock,
&sconn->smb2.stream);
if (ret == -1) {
status = map_nt_error_from_unix(errno);
@@ -119,7 +119,7 @@ static NTSTATUS smbd_initialize_smb2(struct smbd_server_connection *sconn)
}
/* Ensure child is set to non-blocking mode */
- set_blocking(smbd_server_fd(),false);
+ set_blocking(sconn->sock, false);
return NT_STATUS_OK;
}