diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2009-02-05 16:39:28 +0100 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2009-02-05 16:39:28 +0100 |
| commit | 6d139ca4680abcbda5110f2f0886aa038ff62088 (patch) | |
| tree | 7d61db40fb058bcbf08ccd8e0dadc365b819371b /source4/smbd/service_named_pipe.c | |
| parent | 4a9b3052caeb8bb144803b49dcfae82395172bc3 (diff) | |
| parent | afa960cbbcd609123d710c301e7a9a070c1fed70 (diff) | |
| download | samba-6d139ca4680abcbda5110f2f0886aa038ff62088.tar.gz samba-6d139ca4680abcbda5110f2f0886aa038ff62088.tar.bz2 samba-6d139ca4680abcbda5110f2f0886aa038ff62088.zip | |
Merge branch 'master' of ssh://git.samba.org/data/git/samba
Conflicts:
librpc/ndr.pc.in
Diffstat (limited to 'source4/smbd/service_named_pipe.c')
| -rw-r--r-- | source4/smbd/service_named_pipe.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/source4/smbd/service_named_pipe.c b/source4/smbd/service_named_pipe.c index e3c0908a15..de4726e4d5 100644 --- a/source4/smbd/service_named_pipe.c +++ b/source4/smbd/service_named_pipe.c @@ -60,8 +60,8 @@ static void named_pipe_handover_connection(void *private_data) /* * remove the named_pipe layer together with its packet layer */ - conn->ops = pipe_conn->pipe_sock->ops; - conn->private = pipe_conn->pipe_sock->private_data; + conn->ops = pipe_conn->pipe_sock->ops; + conn->private_data = pipe_conn->pipe_sock->private_data; talloc_free(pipe_conn); /* we're now ready to start receiving events on this stream */ @@ -209,7 +209,7 @@ reply: static void named_pipe_recv(struct stream_connection *conn, uint16_t flags) { struct named_pipe_connection *pipe_conn = talloc_get_type( - conn->private, struct named_pipe_connection); + conn->private_data, struct named_pipe_connection); DEBUG(10,("named_pipe_recv\n")); @@ -222,7 +222,7 @@ static void named_pipe_recv(struct stream_connection *conn, uint16_t flags) static void named_pipe_send(struct stream_connection *conn, uint16_t flags) { struct named_pipe_connection *pipe_conn = talloc_get_type( - conn->private, struct named_pipe_connection); + conn->private_data, struct named_pipe_connection); packet_queue_run(pipe_conn->packet); } @@ -238,7 +238,7 @@ static void named_pipe_recv_error(void *private_data, NTSTATUS status) stream_terminate_connection(pipe_conn->connection, nt_errstr(status)); } -static NTSTATUS named_pipe_full_request(void *private, DATA_BLOB blob, size_t *size) +static NTSTATUS named_pipe_full_request(void *private_data, DATA_BLOB blob, size_t *size) { if (blob.length < 8) { return STATUS_MORE_ENTRIES; @@ -262,7 +262,7 @@ static NTSTATUS named_pipe_full_request(void *private, DATA_BLOB blob, size_t *s static void named_pipe_accept(struct stream_connection *conn) { struct named_pipe_socket *pipe_sock = talloc_get_type( - conn->private, struct named_pipe_socket); + conn->private_data, struct named_pipe_socket); struct named_pipe_connection *pipe_conn; DEBUG(5,("named_pipe_accept\n")); @@ -291,7 +291,7 @@ static void named_pipe_accept(struct stream_connection *conn) pipe_conn->pipe_sock = pipe_sock; pipe_conn->connection = conn; - conn->private = pipe_conn; + conn->private_data = pipe_conn; } static const struct stream_server_ops named_pipe_stream_ops = { |