svn commit: samba r4611 - in branches/SAMBA_4_0/source/smb_server: .
tridge at samba.org
tridge at samba.org
Sun Jan 9 04:18:14 GMT 2005
Author: tridge
Date: 2005-01-09 04:18:14 +0000 (Sun, 09 Jan 2005)
New Revision: 4611
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=4611
Log:
- renamed add_socket() to smb_add_socket() as that is less confusing
- removed the spurious call to set_blocking() in the smb server setup.
Modified:
branches/SAMBA_4_0/source/smb_server/smb_server.c
Changeset:
Modified: branches/SAMBA_4_0/source/smb_server/smb_server.c
===================================================================
--- branches/SAMBA_4_0/source/smb_server/smb_server.c 2005-01-09 03:04:45 UTC (rev 4610)
+++ branches/SAMBA_4_0/source/smb_server/smb_server.c 2005-01-09 04:18:14 UTC (rev 4611)
@@ -661,10 +661,10 @@
/*
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 @@
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 smbsrv_accept(struct server_connection *conn)
{
struct smbsrv_connection *smb_conn;
- int fd;
DEBUG(5,("smbsrv_accept\n"));
@@ -853,9 +852,6 @@
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);
More information about the samba-cvs
mailing list