s3-rpc_client: Adapt cli_rpc_pipe_open_generic_auth to use enum credentials_kerberos_...

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>

diff --git a/source3/libsmb/passchange.c b/source3/libsmb/passchange.c
index 9736adab9f6cc582be2d999dbd9d186cc78d17d0..8acd432cc34fca72d15191dd540829bb8e81dc40 100644 (file)
--- 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 e3822d16408171dcf8374dfaad0bcfdec4b6198e..449ebbd747c8d016ea3c1f379eef8181f36f5b99 100644 (file)
--- 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 c4ed08a0c423e6a0fedf0d9ff3514652bd7fc6f2..e697e3f8c6387abb1ca61fc564a37f8125fe72c9 100644 (file)
--- 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 eca2185fe148cceaf9b54892374a2c738b7d4c73..1b26e643dd973fe992335db9b49d1eba117ceee0 100644 (file)
--- 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 b5c4d0b2e93bcb0dc19d8d83d47c996e751d13bb..bf659a84519bea157e0f2ee690d3f1dc2a0cb15f 100644 (file)
--- 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),