diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2014-09-22 20:33:43 -0700 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2014-10-08 01:09:51 +0200 |
| commit | 8166ecaaa06a7febc9697ca4f97a3d61aa02d5c1 (patch) | |
| tree | 6d192e6be041f55c860c275bed5662dfe1635ce7 | |
| parent | 74dcde5347066016ae55f5575ac61061d1f5f7af (diff) | |
| download | samba-8166ecaaa06a7febc9697ca4f97a3d61aa02d5c1.tar.gz samba-8166ecaaa06a7febc9697ca4f97a3d61aa02d5c1.tar.xz samba-8166ecaaa06a7febc9697ca4f97a3d61aa02d5c1.zip | |
s3-rpc_client: Adapt cli_rpc_pipe_open_generic_auth to use enum credentials_kerberos_state
This allows us to pass this value in directly from the cli_credentials structure in winbindd, once we merge this with cli_rpc_pipe_open_spnego().
Andrew Bartlett
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
| -rw-r--r-- | source3/libsmb/passchange.c | 1 | ||||
| -rw-r--r-- | source3/rpc_client/cli_pipe.c | 1 | ||||
| -rw-r--r-- | source3/rpc_client/cli_pipe.h | 1 | ||||
| -rw-r--r-- | source3/rpcclient/rpcclient.c | 1 | ||||
| -rw-r--r-- | source3/utils/net_rpc.c | 1 |
5 files changed, 5 insertions, 0 deletions
diff --git a/source3/libsmb/passchange.c b/source3/libsmb/passchange.c index 9736adab9f..8acd432cc3 100644 --- a/source3/libsmb/passchange.c +++ b/source3/libsmb/passchange.c @@ -153,6 +153,7 @@ NTSTATUS remote_password_change(const char *remote_machine, const char *user_nam result = cli_rpc_pipe_open_generic_auth(cli, &ndr_table_samr, NCACN_NP, + CRED_DONT_USE_KERBEROS, DCERPC_AUTH_TYPE_NTLMSSP, DCERPC_AUTH_LEVEL_PRIVACY, remote_machine, diff --git a/source3/rpc_client/cli_pipe.c b/source3/rpc_client/cli_pipe.c index e3822d1640..449ebbd747 100644 --- a/source3/rpc_client/cli_pipe.c +++ b/source3/rpc_client/cli_pipe.c @@ -2945,6 +2945,7 @@ NTSTATUS cli_rpc_pipe_open_noauth(struct cli_state *cli, NTSTATUS cli_rpc_pipe_open_generic_auth(struct cli_state *cli, const struct ndr_interface_table *table, enum dcerpc_transport_t transport, + enum credentials_use_kerberos use_kerberos, enum dcerpc_AuthType auth_type, enum dcerpc_AuthLevel auth_level, const char *server, diff --git a/source3/rpc_client/cli_pipe.h b/source3/rpc_client/cli_pipe.h index c4ed08a0c4..e697e3f8c6 100644 --- a/source3/rpc_client/cli_pipe.h +++ b/source3/rpc_client/cli_pipe.h @@ -75,6 +75,7 @@ NTSTATUS cli_rpc_pipe_open_noauth_transport(struct cli_state *cli, NTSTATUS cli_rpc_pipe_open_generic_auth(struct cli_state *cli, const struct ndr_interface_table *table, enum dcerpc_transport_t transport, + enum credentials_use_kerberos use_kerberos, enum dcerpc_AuthType auth_type, enum dcerpc_AuthLevel auth_level, const char *server, diff --git a/source3/rpcclient/rpcclient.c b/source3/rpcclient/rpcclient.c index eca2185fe1..1b26e643dd 100644 --- a/source3/rpcclient/rpcclient.c +++ b/source3/rpcclient/rpcclient.c @@ -732,6 +732,7 @@ static NTSTATUS do_cmd(struct cli_state *cli, ntresult = cli_rpc_pipe_open_generic_auth( cli, cmd_entry->table, default_transport, + CRED_AUTO_USE_KERBEROS, pipe_default_auth_type, pipe_default_auth_level, smbXcli_conn_remote_name(cli->conn), diff --git a/source3/utils/net_rpc.c b/source3/utils/net_rpc.c index b5c4d0b2e9..bf659a8451 100644 --- a/source3/utils/net_rpc.c +++ b/source3/utils/net_rpc.c @@ -208,6 +208,7 @@ int run_rpc_command(struct net_context *c, cli, table, (conn_flags & NET_FLAGS_TCP) ? NCACN_IP_TCP : NCACN_NP, + CRED_DONT_USE_KERBEROS, DCERPC_AUTH_TYPE_NTLMSSP, DCERPC_AUTH_LEVEL_PRIVACY, smbXcli_conn_remote_name(cli->conn), |