diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2012-01-10 21:53:42 +1100 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2012-01-18 16:23:24 +0100 |
| commit | 34d52532b588497ea0306de59eabdd36c00242bf (patch) | |
| tree | 592f252f5669e031fc549249c8464f214c79ae36 /source3/rpcclient/rpcclient.c | |
| parent | c62af4f6526d5b4a47b70ecfc4c1c03b1b64cf18 (diff) | |
| download | samba-34d52532b588497ea0306de59eabdd36c00242bf.tar.gz samba-34d52532b588497ea0306de59eabdd36c00242bf.tar.bz2 samba-34d52532b588497ea0306de59eabdd36c00242bf.zip | |
s3-rpcclient: pass struct ndr_interface_table down
This will allow the target service (as determined from the IDL) to be
passed to GSSAPI (rather than the current, incorrect, "cifs").
Andrew Bartlett
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Diffstat (limited to 'source3/rpcclient/rpcclient.c')
| -rw-r--r-- | source3/rpcclient/rpcclient.c | 23 |
1 files changed, 9 insertions, 14 deletions
diff --git a/source3/rpcclient/rpcclient.c b/source3/rpcclient/rpcclient.c index 39b54bf052..0b2789c4ae 100644 --- a/source3/rpcclient/rpcclient.c +++ b/source3/rpcclient/rpcclient.c @@ -682,12 +682,12 @@ static NTSTATUS do_cmd(struct cli_state *cli, /* Open pipe */ - if ((cmd_entry->interface != NULL) && (cmd_entry->rpc_pipe == NULL)) { + if ((cmd_entry->table != NULL) && (cmd_entry->rpc_pipe == NULL)) { switch (pipe_default_auth_type) { case DCERPC_AUTH_TYPE_NONE: ntresult = cli_rpc_pipe_open_noauth_transport( cli, default_transport, - cmd_entry->interface, + &cmd_entry->table->syntax_id, &cmd_entry->rpc_pipe); break; case DCERPC_AUTH_TYPE_SPNEGO: @@ -703,7 +703,7 @@ static NTSTATUS do_cmd(struct cli_state *cli, break; } ntresult = cli_rpc_pipe_open_spnego( - cli, cmd_entry->interface, + cli, &cmd_entry->table->syntax_id, default_transport, oid, pipe_default_auth_level, @@ -717,7 +717,7 @@ static NTSTATUS do_cmd(struct cli_state *cli, case DCERPC_AUTH_TYPE_NTLMSSP: case DCERPC_AUTH_TYPE_KRB5: ntresult = cli_rpc_pipe_open_generic_auth( - cli, cmd_entry->interface, + cli, &cmd_entry->table->syntax_id, default_transport, pipe_default_auth_type, pipe_default_auth_level, @@ -729,7 +729,7 @@ static NTSTATUS do_cmd(struct cli_state *cli, break; case DCERPC_AUTH_TYPE_SCHANNEL: ntresult = cli_rpc_pipe_open_schannel( - cli, cmd_entry->interface, + cli, &cmd_entry->table->syntax_id, default_transport, pipe_default_auth_level, get_cmdline_auth_info_domain(auth_info), @@ -738,21 +738,18 @@ static NTSTATUS do_cmd(struct cli_state *cli, default: DEBUG(0, ("Could not initialise %s. Invalid " "auth type %u\n", - get_pipe_name_from_syntax( - talloc_tos(), - cmd_entry->interface), + cmd_entry->table->name, pipe_default_auth_type )); return NT_STATUS_UNSUCCESSFUL; } if (!NT_STATUS_IS_OK(ntresult)) { DEBUG(0, ("Could not initialise %s. Error was %s\n", - get_pipe_name_from_syntax( - talloc_tos(), cmd_entry->interface), + cmd_entry->table->name, nt_errstr(ntresult) )); return ntresult; } - if (ndr_syntax_id_equal(cmd_entry->interface, + if (ndr_syntax_id_equal(&cmd_entry->table->syntax_id, &ndr_table_netlogon.syntax_id)) { uint32_t neg_flags = NETLOGON_NEG_AUTH2_ADS_FLAGS; enum netr_SchannelType sec_channel_type; @@ -777,9 +774,7 @@ static NTSTATUS do_cmd(struct cli_state *cli, if (!NT_STATUS_IS_OK(ntresult)) { DEBUG(0, ("Could not initialise credentials for %s.\n", - get_pipe_name_from_syntax( - talloc_tos(), - cmd_entry->interface))); + cmd_entry->table->name)); return ntresult; } } |