r2447: let the server code use the new lib/socket/ stuff

metze
(This used to be commit 2fd577d2417e117a7e8c1a56feb147eae805df34)

1 files changed, 6 insertions, 6 deletions

diff --git a/source4/rpc_server/dcerpc_server.c b/source4/rpc_server/dcerpc_server.c
index e619053f6a..14b7c14d2a 100644
--- a/source4/rpc_server/dcerpc_server.c
+++ b/source4/rpc_server/dcerpc_server.c
@@ -929,7 +929,7 @@ NTSTATUS dcesrv_input(struct dcesrv_connection *dce_conn, const DATA_BLOB *data)
 */
 NTSTATUS dcesrv_output(struct dcesrv_connection *dce_conn, 
 		       void *private,
-		       ssize_t (*write_fn)(void *, const void *, size_t))
+		       ssize_t (*write_fn)(void *, DATA_BLOB *))
 {
 	struct dcesrv_call_state *call;
 	struct dcesrv_call_reply *rep;
@@ -942,7 +942,7 @@ NTSTATUS dcesrv_output(struct dcesrv_connection *dce_conn,
 	}
 	rep = call->replies;
 
-	nwritten = write_fn(private, rep->data.data, rep->data.length);
+	nwritten = write_fn(private, &rep->data);
 	if (nwritten == -1) {
 		/* TODO: hmm, how do we cope with this? destroy the
 		   connection perhaps? */
@@ -972,13 +972,13 @@ NTSTATUS dcesrv_output(struct dcesrv_connection *dce_conn,
 /*
   write_fn() for dcesrv_output_blob()
 */
-static ssize_t dcesrv_output_blob_write_fn(void *private, const void *buf, size_t count)
+static ssize_t dcesrv_output_blob_write_fn(void *private, DATA_BLOB *out)
 {
 	DATA_BLOB *blob = private;
-	if (count < blob->length) {
-		blob->length = count;
+	if (out->length < blob->length) {
+		blob->length = out->length;
 	}
-	memcpy(blob->data, buf, blob->length);
+	memcpy(blob->data, out->data, blob->length);
 	return blob->length;
 }