diff options
| author | Stefan Metzmacher <metze@samba.org> | 2014-01-15 12:58:52 +0100 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2014-05-26 03:31:28 +0200 |
| commit | 35192e8316291daf70576ceeb483c0204ec9d455 (patch) | |
| tree | a349072045d2bf1227a32480bae21cf9acfaed8a /source4 | |
| parent | 7ea04759d7f94a5d4fa57a63612afd9e752ba5e9 (diff) | |
| download | samba-35192e8316291daf70576ceeb483c0204ec9d455.tar.gz samba-35192e8316291daf70576ceeb483c0204ec9d455.tar.xz samba-35192e8316291daf70576ceeb483c0204ec9d455.zip | |
s4:librpc/rpc: remove pipe_np_smb2_state and use pipe_np_smb_state
There's no need for two almost identical structures.
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Diffstat (limited to 'source4')
| -rw-r--r-- | source4/librpc/rpc/dcerpc_connect.c | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/source4/librpc/rpc/dcerpc_connect.c b/source4/librpc/rpc/dcerpc_connect.c index 7b1ed48db8c..42ca0df755f 100644 --- a/source4/librpc/rpc/dcerpc_connect.c +++ b/source4/librpc/rpc/dcerpc_connect.c @@ -191,12 +191,6 @@ static NTSTATUS dcerpc_pipe_connect_ncacn_np_smb_recv(struct composite_context * return status; } - -struct pipe_np_smb2_state { - struct dcerpc_pipe_connect io; -}; - - /* Stage 3 of ncacn_np_smb: Named pipe opened (or not) */ @@ -222,8 +216,8 @@ static void continue_smb2_connect(struct tevent_req *subreq) struct composite_context *c = tevent_req_callback_data(subreq, struct composite_context); - struct pipe_np_smb2_state *s = talloc_get_type(c->private_data, - struct pipe_np_smb2_state); + struct pipe_np_smb_state *s = talloc_get_type(c->private_data, + struct pipe_np_smb_state); struct smb2_tree *t; /* receive result of smb2 connect request */ @@ -260,7 +254,7 @@ static struct composite_context *dcerpc_pipe_connect_ncacn_np_smb2_send( struct loadparm_context *lp_ctx) { struct composite_context *c; - struct pipe_np_smb2_state *s; + struct pipe_np_smb_state *s; struct tevent_req *subreq; struct smbcli_options options; const char *host; @@ -270,7 +264,7 @@ static struct composite_context *dcerpc_pipe_connect_ncacn_np_smb2_send( c = composite_create(mem_ctx, io->conn->event_ctx); if (c == NULL) return NULL; - s = talloc_zero(c, struct pipe_np_smb2_state); + s = talloc_zero(c, struct pipe_np_smb_state); if (composite_nomem(s, c)) return c; c->private_data = s; |