summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2005-01-23 09:03:05 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:09:07 -0500
commitfa55d52edef723c34d960e455597291c58303cff (patch)
treedfcf1c5ec460016dbbedb6fcd713eedb7a3c279f
parent9d6e923aab2036d6ce72e31aa4633d55b5991558 (diff)
downloadsamba-fa55d52edef723c34d960e455597291c58303cff.tar.gz
samba-fa55d52edef723c34d960e455597291c58303cff.tar.bz2
samba-fa55d52edef723c34d960e455597291c58303cff.zip
r4939: make a few more private pointers type safe (this might help abartlet
track down a bug he just told me about) (This used to be commit fb326cbb32ef7eebb7073777d834d6bea25069a7)
-rw-r--r--source4/smbd/service.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/source4/smbd/service.c b/source4/smbd/service.c
index 12aa43132c..40a2a4b506 100644
--- a/source4/smbd/service.c
+++ b/source4/smbd/service.c
@@ -279,7 +279,8 @@ void server_terminate_connection(struct server_connection *srv_conn, const char
void server_accept_handler(struct event_context *ev, struct fd_event *fde,
struct timeval t, uint16_t flags)
{
- struct server_stream_socket *stream_socket = fde->private;
+ struct server_stream_socket *stream_socket = talloc_get_type(fde->private,
+ struct server_stream_socket);
stream_socket->service->server->model.ops->accept_connection(ev, fde, t, flags);
}
@@ -287,7 +288,8 @@ void server_accept_handler(struct event_context *ev, struct fd_event *fde,
void server_io_handler(struct event_context *ev, struct fd_event *fde,
struct timeval t, uint16_t flags)
{
- struct server_connection *conn = fde->private;
+ struct server_connection *conn = talloc_get_type(fde->private,
+ struct server_connection);
conn->event.idle->next_event = timeval_sum(&t, &conn->event.idle_time);
@@ -305,7 +307,8 @@ void server_io_handler(struct event_context *ev, struct fd_event *fde,
void server_idle_handler(struct event_context *ev, struct timed_event *idle,
struct timeval t)
{
- struct server_connection *conn = idle->private;
+ struct server_connection *conn = talloc_get_type(idle->private,
+ struct server_connection);
/* Not all services provide an idle handler */
if (conn->stream_socket->stream.ops->idle_handler) {