diff options
author | Stefan Metzmacher <metze@samba.org> | 2007-05-16 14:52:54 +0000 |
---|---|---|
committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 14:52:30 -0500 |
commit | 40cd2d778093d7799b27b6beb37166d8a53f965c (patch) | |
tree | df28b80a71dd74da23820d3989e322bcba56c580 /source4/librpc/rpc/dcerpc_smb.c | |
parent | 3e5335063a15dda4c21baab0961d766f30b21d84 (diff) | |
download | samba-40cd2d778093d7799b27b6beb37166d8a53f965c.tar.gz samba-40cd2d778093d7799b27b6beb37166d8a53f965c.tar.bz2 samba-40cd2d778093d7799b27b6beb37166d8a53f965c.zip |
r22944: fix bug #4618:
rename private -> private_data
metze
(This used to be commit 58551f2f28fce8f1fcd04736c47ecd7458f32ea2)
Diffstat (limited to 'source4/librpc/rpc/dcerpc_smb.c')
-rw-r--r-- | source4/librpc/rpc/dcerpc_smb.c | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/source4/librpc/rpc/dcerpc_smb.c b/source4/librpc/rpc/dcerpc_smb.c index 7f0bcf0485..edeb898d5f 100644 --- a/source4/librpc/rpc/dcerpc_smb.c +++ b/source4/librpc/rpc/dcerpc_smb.c @@ -40,7 +40,7 @@ struct smb_private { */ static void pipe_dead(struct dcerpc_connection *c, NTSTATUS status) { - struct smb_private *smb = c->transport.private; + struct smb_private *smb = c->transport.private_data; if (smb->dead) { return; @@ -85,7 +85,7 @@ static void smb_read_callback(struct smbcli_request *req) NTSTATUS status; state = talloc_get_type(req->async.private, struct smb_read_state); - smb = talloc_get_type(state->c->transport.private, struct smb_private); + smb = talloc_get_type(state->c->transport.private_data, struct smb_private); io = state->io; status = smb_raw_read_recv(state->req, io); @@ -142,7 +142,7 @@ static void smb_read_callback(struct smbcli_request *req) */ static NTSTATUS send_read_request_continue(struct dcerpc_connection *c, DATA_BLOB *blob) { - struct smb_private *smb = c->transport.private; + struct smb_private *smb = c->transport.private_data; union smb_read *io; struct smb_read_state *state; struct smbcli_request *req; @@ -198,7 +198,7 @@ static NTSTATUS send_read_request_continue(struct dcerpc_connection *c, DATA_BLO */ static NTSTATUS send_read_request(struct dcerpc_connection *c) { - struct smb_private *smb = c->transport.private; + struct smb_private *smb = c->transport.private_data; if (smb->dead) { return NT_STATUS_CONNECTION_DISCONNECTED; @@ -250,7 +250,7 @@ static void smb_trans_callback(struct smbcli_request *req) */ static NTSTATUS smb_send_trans_request(struct dcerpc_connection *c, DATA_BLOB *blob) { - struct smb_private *smb = c->transport.private; + struct smb_private *smb = c->transport.private_data; struct smb_trans2 *trans; uint16_t setup[2]; struct smb_trans_state *state; @@ -313,7 +313,7 @@ static void smb_write_callback(struct smbcli_request *req) */ static NTSTATUS smb_send_request(struct dcerpc_connection *c, DATA_BLOB *blob, BOOL trigger_read) { - struct smb_private *smb = c->transport.private; + struct smb_private *smb = c->transport.private_data; union smb_write io; struct smbcli_request *req; @@ -357,7 +357,7 @@ static NTSTATUS smb_send_request(struct dcerpc_connection *c, DATA_BLOB *blob, B */ static NTSTATUS smb_shutdown_pipe(struct dcerpc_connection *c, NTSTATUS status) { - struct smb_private *smb = c->transport.private; + struct smb_private *smb = c->transport.private_data; union smb_close io; struct smbcli_request *req; @@ -383,7 +383,7 @@ static NTSTATUS smb_shutdown_pipe(struct dcerpc_connection *c, NTSTATUS status) */ static const char *smb_peer_name(struct dcerpc_connection *c) { - struct smb_private *smb = c->transport.private; + struct smb_private *smb = c->transport.private_data; return smb->server_name; } @@ -392,7 +392,7 @@ static const char *smb_peer_name(struct dcerpc_connection *c) */ static const char *smb_target_hostname(struct dcerpc_connection *c) { - struct smb_private *smb = talloc_get_type(c->transport.private, struct smb_private); + struct smb_private *smb = talloc_get_type(c->transport.private_data, struct smb_private); return smb->tree->session->transport->socket->hostname; } @@ -401,7 +401,7 @@ static const char *smb_target_hostname(struct dcerpc_connection *c) */ static NTSTATUS smb_session_key(struct dcerpc_connection *c, DATA_BLOB *session_key) { - struct smb_private *smb = c->transport.private; + struct smb_private *smb = c->transport.private_data; if (smb->tree->session->user_session_key.data) { *session_key = smb->tree->session->user_session_key; @@ -504,7 +504,7 @@ static void pipe_open_recv(struct smbcli_request *req) fill in the transport methods */ c->transport.transport = NCACN_NP; - c->transport.private = NULL; + c->transport.private_data = NULL; c->transport.shutdown_pipe = smb_shutdown_pipe; c->transport.peer_name = smb_peer_name; c->transport.target_hostname = smb_target_hostname; @@ -526,7 +526,7 @@ static void pipe_open_recv(struct smbcli_request *req) if (composite_nomem(smb->server_name, ctx)) return; smb->dead = false; - c->transport.private = smb; + c->transport.private_data = smb; composite_done(ctx); } @@ -556,7 +556,7 @@ struct smbcli_tree *dcerpc_smb_tree(struct dcerpc_connection *c) if (c->transport.transport != NCACN_NP) return NULL; - smb = talloc_get_type(c->transport.private, struct smb_private); + smb = talloc_get_type(c->transport.private_data, struct smb_private); if (!smb) return NULL; return smb->tree; @@ -571,7 +571,7 @@ uint16_t dcerpc_smb_fnum(struct dcerpc_connection *c) if (c->transport.transport != NCACN_NP) return 0; - smb = talloc_get_type(c->transport.private, struct smb_private); + smb = talloc_get_type(c->transport.private_data, struct smb_private); if (!smb) return 0; return smb->fnum; |