summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2005-01-09 04:18:14 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:08:33 -0500
commit770c65affdefe289d89238ee90834bac90acf46b (patch)
tree7359ad815cb9f432349bd24e2a8b0a157474c0f1
parentcb032eebd6a185e01718c2a8b237c13c9e99ea44 (diff)
downloadsamba-770c65affdefe289d89238ee90834bac90acf46b.tar.gz
samba-770c65affdefe289d89238ee90834bac90acf46b.tar.bz2
samba-770c65affdefe289d89238ee90834bac90acf46b.zip
r4611: - renamed add_socket() to smb_add_socket() as that is less confusing
- removed the spurious call to set_blocking() in the smb server setup. (This used to be commit 76d905d12e6f65a3670e4167ec79d8876b772ca6)
-rw-r--r--source4/smb_server/smb_server.c16
1 files changed, 6 insertions, 10 deletions
diff --git a/source4/smb_server/smb_server.c b/source4/smb_server/smb_server.c
index 0e845b9697..e6201c077e 100644
--- a/source4/smb_server/smb_server.c
+++ b/source4/smb_server/smb_server.c
@@ -661,10 +661,10 @@ static void smbsrv_exit(struct server_service *service, const char *reason)
/*
add a socket address to the list of events, one event per port
*/
-static void add_socket(struct server_service *service,
- const struct model_ops *model_ops,
- struct socket_context *socket_ctx,
- struct ipv4_addr *ifip)
+static void smb_add_socket(struct server_service *service,
+ const struct model_ops *model_ops,
+ struct socket_context *socket_ctx,
+ struct ipv4_addr *ifip)
{
const char **ports = lp_smb_ports();
int i;
@@ -702,13 +702,13 @@ static void smbsrv_init(struct server_service *service, const struct model_ops *
continue;
}
- add_socket(service, model_ops, NULL, ifip);
+ smb_add_socket(service, model_ops, NULL, ifip);
}
} else {
struct ipv4_addr ifip;
/* Just bind to lp_socket_address() (usually 0.0.0.0) */
ifip = interpret_addr2(lp_socket_address());
- add_socket(service, model_ops, NULL, &ifip);
+ smb_add_socket(service, model_ops, NULL, &ifip);
}
}
@@ -823,7 +823,6 @@ void smbd_process_async(struct smbsrv_connection *smb_conn)
void smbsrv_accept(struct server_connection *conn)
{
struct smbsrv_connection *smb_conn;
- int fd;
DEBUG(5,("smbsrv_accept\n"));
@@ -853,9 +852,6 @@ void smbsrv_accept(struct server_connection *conn)
conn->private_data = smb_conn;
- fd = socket_get_fd(conn->socket);
- set_blocking(fd, True);
-
/* setup the DCERPC server subsystem */
dcesrv_init_context(smb_conn, &smb_conn->dcesrv);