summaryrefslogtreecommitdiff
path: root/source4/smbd
diff options
context:
space:
mode:
Diffstat (limited to 'source4/smbd')
-rw-r--r--source4/smbd/service.c14
-rw-r--r--source4/smbd/service.h12
2 files changed, 2 insertions, 24 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;
}
diff --git a/source4/smbd/service.h b/source4/smbd/service.h
index 41ad381f9e..5d72d388fd 100644
--- a/source4/smbd/service.h
+++ b/source4/smbd/service.h
@@ -63,17 +63,7 @@ struct server_service_ops {
void (*service_exit)(struct server_service *srv_ctx, const char *reason);
};
-struct socket_ops {
- int dummy;
-};
-
-struct socket_context {
- void *private_data;
- struct socket_ops *ops;
- const char *client_addr;
- uint_t pkt_count;
- struct fd_event *fde;
-};
+struct socket_context;
struct server_socket {
struct server_socket *next,*prev;