s4:rpc_server: only pass context to op_bind() hooks

[gd/samba-autobuild/.git] / source4 / rpc_server / echo / rpc_echo.c

diff --git a/source4/rpc_server/echo/rpc_echo.c b/source4/rpc_server/echo/rpc_echo.c
index 8f562b482621f03e243eb07957489fca7ad63a3a..b0baf82d7d0bbc3232c1e75be118f673c887b154 100644 (file)
--- a/source4/rpc_server/echo/rpc_echo.c
+++ b/source4/rpc_server/echo/rpc_echo.c
@@ -8,7 +8,7 @@
    
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
+   the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
    
    This program is distributed in the hope that it will be useful,
@@ -17,8 +17,7 @@
    GNU General Public License for more details.
    
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "includes.h"
@@ -27,6 +26,13 @@
 #include "librpc/gen_ndr/ndr_echo.h"
 #include "lib/events/events.h"
 
+#define DCESRV_INTERFACE_RPCECHO_BIND(context, iface) \
+       dcesrv_interface_rpcecho_bind(context, iface)
+static NTSTATUS dcesrv_interface_rpcecho_bind(struct dcesrv_connection_context *context,
+                                             const struct dcesrv_interface *iface)
+{
+       return dcesrv_interface_bind_allow_connect(context, iface);
+}
 
 static NTSTATUS dcesrv_echo_AddOne(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx, struct echo_AddOne *r)
 {
@@ -40,7 +46,7 @@ static NTSTATUS dcesrv_echo_EchoData(struct dcesrv_call_state *dce_call, TALLOC_
                return NT_STATUS_OK;
        }
 
-       r->out.out_data = talloc_memdup(mem_ctx, r->in.in_data, r->in.len);
+       r->out.out_data = (uint8_t *)talloc_memdup(mem_ctx, r->in.in_data, r->in.len);
        if (!r->out.out_data) {
                return NT_STATUS_NO_MEMORY;
        }
@@ -55,7 +61,7 @@ static NTSTATUS dcesrv_echo_SinkData(struct dcesrv_call_state *dce_call, TALLOC_
 
 static NTSTATUS dcesrv_echo_SourceData(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx, struct echo_SourceData *r)
 {
-       int i;
+       unsigned int i;
 
        r->out.data = talloc_array(mem_ctx, uint8_t, r->in.len);
        if (!r->out.data) {
@@ -72,7 +78,9 @@ static NTSTATUS dcesrv_echo_SourceData(struct dcesrv_call_state *dce_call, TALLO
 static NTSTATUS dcesrv_echo_TestCall(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx, struct echo_TestCall *r)
 {
        *r->out.s2 = talloc_strdup(mem_ctx, r->in.s1);
-       
+       if (r->in.s1 && !*r->out.s2) {
+               return NT_STATUS_NO_MEMORY;
+       }
        return NT_STATUS_OK;
 }
 
@@ -134,6 +142,9 @@ static NTSTATUS dcesrv_echo_TestSurrounding(struct dcesrv_call_state *dce_call,
        }
        r->out.data->x = 2 * r->in.data->x;
        r->out.data->surrounding = talloc_zero_array(mem_ctx, uint16_t, r->out.data->x);
+       if (!r->out.data->surrounding) {
+               return NT_STATUS_NO_MEMORY;
+       }
 
        return NT_STATUS_OK;
 }
@@ -152,10 +163,10 @@ struct echo_TestSleep_private {
        struct echo_TestSleep *r;
 };
 
-static void echo_TestSleep_handler(struct event_context *ev, struct timed_event *te, 
-                                  struct timeval t, void *private)
+static void echo_TestSleep_handler(struct tevent_context *ev, struct tevent_timer *te, 
+                                  struct timeval t, void *private_data)
 {
-       struct echo_TestSleep_private *p = talloc_get_type(private, 
+       struct echo_TestSleep_private *p = talloc_get_type(private_data,
                                                           struct echo_TestSleep_private);
        struct echo_TestSleep *r = p->r;
        NTSTATUS status;
@@ -188,7 +199,7 @@ static long dcesrv_echo_TestSleep(struct dcesrv_call_state *dce_call, TALLOC_CTX
        p->dce_call     = dce_call;
        p->r            = r;
 
-       event_add_timed(dce_call->event_ctx, p, 
+       tevent_add_timer(dce_call->event_ctx, p,
                        timeval_add(&dce_call->time, r->in.seconds, 0),
                        echo_TestSleep_handler, p);