diff options
| author | Stefan Metzmacher <metze@samba.org> | 2011-09-23 08:35:17 +0200 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2011-11-30 15:13:36 +0100 |
| commit | 4afbda221c20ffa36a1d1e37ef11f86073a49da6 (patch) | |
| tree | 8d9cc7d03f5bb4ea4ffa761dfee0ba7e9cdc005c /source4/librpc/rpc/dcerpc_smb.c | |
| parent | 99ef6a4bec1058b3649e5e72f8ea85f6df93a154 (diff) | |
| download | samba-4afbda221c20ffa36a1d1e37ef11f86073a49da6.tar.gz samba-4afbda221c20ffa36a1d1e37ef11f86073a49da6.tar.bz2 samba-4afbda221c20ffa36a1d1e37ef11f86073a49da6.zip | |
s4:libcli/raw: implement on top of smbXcli_conn/req
metze
Autobuild-User: Stefan Metzmacher <metze@samba.org>
Autobuild-Date: Wed Nov 30 15:13:36 CET 2011 on sn-devel-104
Diffstat (limited to 'source4/librpc/rpc/dcerpc_smb.c')
| -rw-r--r-- | source4/librpc/rpc/dcerpc_smb.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/source4/librpc/rpc/dcerpc_smb.c b/source4/librpc/rpc/dcerpc_smb.c index bdba21734c..f4f44577f4 100644 --- a/source4/librpc/rpc/dcerpc_smb.c +++ b/source4/librpc/rpc/dcerpc_smb.c @@ -26,6 +26,7 @@ #include "librpc/rpc/dcerpc.h" #include "librpc/rpc/dcerpc_proto.h" #include "librpc/rpc/rpc_common.h" +#include "../libcli/smb/smbXcli_base.h" /* transport private information used by SMB pipe transport */ struct smb_private { @@ -417,7 +418,7 @@ static const char *smb_target_hostname(struct dcecli_connection *c) { struct smb_private *smb = talloc_get_type(c->transport.private_data, struct smb_private); if (smb == NULL) return ""; - return smb->tree->session->transport->socket->hostname; + return smbXcli_conn_remote_name(smb->tree->session->transport->conn); } /* @@ -456,9 +457,10 @@ struct composite_context *dcerpc_pipe_open_smb_send(struct dcerpc_pipe *p, /* if we don't have a binding on this pipe yet, then create one */ if (p->binding == NULL) { NTSTATUS status; + const char *r = smbXcli_conn_remote_name(tree->session->transport->conn); char *s; - SMB_ASSERT(tree->session->transport->socket->hostname != NULL); - s = talloc_asprintf(p, "ncacn_np:%s", tree->session->transport->socket->hostname); + SMB_ASSERT(r != NULL); + s = talloc_asprintf(p, "ncacn_np:%s", r); if (s == NULL) return NULL; status = dcerpc_parse_binding(p, s, &p->binding); talloc_free(s); @@ -549,7 +551,7 @@ static void pipe_open_recv(struct smbcli_request *req) smb->fnum = state->open->ntcreatex.out.file.fnum; smb->tree = talloc_reference(smb, state->tree); smb->server_name= strupper_talloc(smb, - state->tree->session->transport->called.name); + smbXcli_conn_remote_name(state->tree->session->transport->conn)); if (composite_nomem(smb->server_name, ctx)) return; smb->dead = false; |