summaryrefslogtreecommitdiff
path: root/source4/smbd/service.c
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2004-09-13 13:13:21 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 12:58:44 -0500
commit360f125f255fd7d5a172d012c00b3cfbff5a6989 (patch)
treee923d87fa67562dca791eecd450ea10243fbc389 /source4/smbd/service.c
parentcff1f3e8a961ffc15c09ef5de1aa965122e6e4f6 (diff)
downloadsamba-360f125f255fd7d5a172d012c00b3cfbff5a6989.tar.gz
samba-360f125f255fd7d5a172d012c00b3cfbff5a6989.tar.bz2
samba-360f125f255fd7d5a172d012c00b3cfbff5a6989.zip
r2326: remove definition and usage of struct socket_context
metze (This used to be commit 1854907da8d577db41de9aa14573d5c8c0092f47)
Diffstat (limited to 'source4/smbd/service.c')
-rw-r--r--source4/smbd/service.c14
1 files changed, 1 insertions, 13 deletions
diff --git a/source4/smbd/service.c b/source4/smbd/service.c
index 2f4be5151d..bcdb953e56 100644
--- a/source4/smbd/service.c
+++ b/source4/smbd/service.c
@@ -210,17 +210,7 @@ struct server_connection *server_setup_connection(struct event_context *ev, stru
srv_conn->service = server_socket->service;
/* TODO: we need a generic socket subsystem */
- srv_conn->socket = talloc_p(srv_conn->mem_ctx, struct socket_context);
- if (!srv_conn->socket) {
- DEBUG(0,("talloc_p(srv_conn->mem_ctx, struct socket_context) failed\n"));
- talloc_destroy(mem_ctx);
- return NULL;
- }
- srv_conn->socket->private_data = NULL;
- srv_conn->socket->ops = NULL;
- srv_conn->socket->client_addr = NULL;
- srv_conn->socket->pkt_count = 0;
- srv_conn->socket->fde = srv_conn->event.fde;
+ srv_conn->socket = NULL;
/* create a smb server context and add it to out event
handling */
@@ -230,8 +220,6 @@ struct server_connection *server_setup_connection(struct event_context *ev, stru
srv_conn->event.fde = event_add_fd(ev,&fde);
srv_conn->event.idle = event_add_timed(ev,&idle);
- srv_conn->socket->fde = srv_conn->event.fde;
-
return srv_conn;
}