diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2005-09-25 12:26:07 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:38:53 -0500 |
| commit | 5a522b31003d50cf476ead83fb322abeb1525957 (patch) | |
| tree | 8390edcfa3bf191138e6225a8fa39d525293bcae /source4/libnet/libnet_rpc.c | |
| parent | 2fe7c3a34a922b5a590ed3b7ebdd17759b4af6b2 (diff) | |
| download | samba-5a522b31003d50cf476ead83fb322abeb1525957.tar.gz samba-5a522b31003d50cf476ead83fb322abeb1525957.tar.bz2 samba-5a522b31003d50cf476ead83fb322abeb1525957.zip | |
r10486: This is a merge of Brad Henry's 'net join' rework, to better perform
an ADS join, particularly as a DC. This represents the bulk of his
Google SOC work, and I'm very pleased to intergrate it into the tree.
(Metze will intergrate the DRSUAPI work later).
Both metze and myself have also put a lot of time into this patch, and
in mentoring Brad in general. In return, Brad has been a very good
student, and has taken the comments well.
Since it's last appearance on samba-technical@, I have made
correctness and valgrind fixups, as well as adding a new 'BINDING'
mode to the libnet_rpc routines. This allows the exact binding string
to be passed down from the torture code, including options and exact
target host.
Andrew Bartlett
(This used to be commit d6fa105fdabbeb83a9b0e50dad49d1649afdb2a4)
Diffstat (limited to 'source4/libnet/libnet_rpc.c')
| -rw-r--r-- | source4/libnet/libnet_rpc.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/source4/libnet/libnet_rpc.c b/source4/libnet/libnet_rpc.c index 8184b9b828..7b07cedeac 100644 --- a/source4/libnet/libnet_rpc.c +++ b/source4/libnet/libnet_rpc.c @@ -36,8 +36,14 @@ static NTSTATUS libnet_RpcConnectSrv(struct libnet_context *ctx, TALLOC_CTX *mem { NTSTATUS status; const char *binding = NULL; - - binding = talloc_asprintf(mem_ctx, "ncacn_np:%s", r->in.domain_name); + switch (r->level) { + case LIBNET_RPC_CONNECT_SERVER: + binding = talloc_asprintf(mem_ctx, "ncacn_np:%s", r->in.domain_name); + break; + case LIBNET_RPC_CONNECT_BINDING: + binding = r->in.binding; + break; + } status = dcerpc_pipe_connect(mem_ctx, &r->out.dcerpc_pipe, binding, r->in.dcerpc_iface_uuid,r->in.dcerpc_iface_version, @@ -115,6 +121,8 @@ NTSTATUS libnet_RpcConnect(struct libnet_context *ctx, TALLOC_CTX *mem_ctx, stru switch (r->level) { case LIBNET_RPC_CONNECT_SERVER: return libnet_RpcConnectSrv(ctx, mem_ctx, r); + case LIBNET_RPC_CONNECT_BINDING: + return libnet_RpcConnectSrv(ctx, mem_ctx, r); case LIBNET_RPC_CONNECT_PDC: return libnet_RpcConnectPdc(ctx, mem_ctx, r); } |