2 files changed, 7 insertions, 18 deletions

diff --git a/source4/rpc_server/dcerpc_server.c b/source4/rpc_server/dcerpc_server.c
index f9e2d8d28e..3aeb7033d1 100644
--- a/source4/rpc_server/dcerpc_server.c
+++ b/source4/rpc_server/dcerpc_server.c
@@ -1057,21 +1057,18 @@ static void dcesrv_accept(struct server_connection *srv_conn)
 	dcesrv_sock_accept(srv_conn);
 }
 
-static void dcesrv_recv(struct server_connection *srv_conn, time_t t, uint16_t flags)
+static void dcesrv_recv(struct server_connection *srv_conn, 
+			struct timeval t, uint16_t flags)
 {
 	dcesrv_sock_recv(srv_conn, t, flags);
 }
 
-static void dcesrv_send(struct server_connection *srv_conn, time_t t, uint16_t flags)
+static void dcesrv_send(struct server_connection *srv_conn, 
+			struct timeval t, uint16_t flags)
 {
 	dcesrv_sock_send(srv_conn, t, flags);
 }
 
-static void dcesrv_idle(struct server_connection *srv_conn, time_t t)
-{
-	dcesrv_sock_idle(srv_conn, t);
-}
-
 static void dcesrv_close(struct server_connection *srv_conn, const char *reason)
 {
 	dcesrv_sock_close(srv_conn, reason);
@@ -1190,7 +1187,7 @@ static const struct server_service_ops dcesrv_ops = {
 	.accept_connection	= dcesrv_accept,
 	.recv_handler		= dcesrv_recv,
 	.send_handler		= dcesrv_send,
-	.idle_handler		= dcesrv_idle,
+	.idle_handler		= NULL,
 	.close_connection	= dcesrv_close,
 	.service_exit		= dcesrv_exit,	
 };
diff --git a/source4/rpc_server/dcerpc_sock.c b/source4/rpc_server/dcerpc_sock.c
index 544082471e..f8d0bbfc6d 100644
--- a/source4/rpc_server/dcerpc_sock.c
+++ b/source4/rpc_server/dcerpc_sock.c
@@ -248,7 +248,7 @@ void dcesrv_sock_accept(struct server_connection *conn)
 	return;	
 }
 
-void dcesrv_sock_recv(struct server_connection *conn, time_t t, uint16_t flags)
+void dcesrv_sock_recv(struct server_connection *conn, struct timeval t, uint16_t flags)
 {
 	NTSTATUS status;
 	struct dcesrv_connection *dce_conn = conn->private_data;
@@ -288,7 +288,7 @@ void dcesrv_sock_recv(struct server_connection *conn, time_t t, uint16_t flags)
 	return;	
 }
 
-void dcesrv_sock_send(struct server_connection *conn, time_t t, uint16_t flags)
+void dcesrv_sock_send(struct server_connection *conn, struct timeval t, uint16_t flags)
 {
 	struct dcesrv_connection *dce_conn = conn->private_data;
 	NTSTATUS status;
@@ -308,14 +308,6 @@ void dcesrv_sock_send(struct server_connection *conn, time_t t, uint16_t flags)
 	return;
 }
 
-void dcesrv_sock_idle(struct server_connection *conn, time_t t)
-{
-	DEBUG(10,("dcesrv_sock_idle\n"));
-	conn->event.idle->next_event = t + 5;
-
-	return;	
-}
-
 void dcesrv_sock_close(struct server_connection *conn, const char *reason)
 {
 	struct dcesrv_connection *dce_conn = conn->private_data;