r5928: Use cli_credentials in:

 - gtk+ (returned by GtkHostBindingDialog as well now)
 - torture/
 - librpc/
 - lib/com/dcom/
(This used to be commit ccefd782335e01e8e6ecb2bcd28a4f999c53b1a6)

1 files changed, 12 insertions, 11 deletions

diff --git a/source4/librpc/rpc/dcerpc_auth.c b/source4/librpc/rpc/dcerpc_auth.c
index ac74788ba6..c5bfe150bd 100644
--- a/source4/librpc/rpc/dcerpc_auth.c
+++ b/source4/librpc/rpc/dcerpc_auth.c
@@ -143,10 +143,7 @@ done:
 */
 NTSTATUS dcerpc_bind_auth_password(struct dcerpc_pipe *p,
 				   const char *uuid, uint_t version,
-				   const char *workstation,
-				   const char *domain,
-				   const char *username,
-				   const char *password,
+				   struct cli_credentials *credentials,
 				   uint8_t auth_type,
 				   const char *service)
 {
@@ -162,28 +159,32 @@ NTSTATUS dcerpc_bind_auth_password(struct dcerpc_pipe *p,
 		return status;
 	}
 
-	status = gensec_set_workstation(p->conn->security_state.generic_state, workstation);
+	status = gensec_set_workstation(p->conn->security_state.generic_state, 
+								cli_credentials_get_workstation(credentials));
 	if (!NT_STATUS_IS_OK(status)) {
 		DEBUG(1, ("Failed to start set GENSEC client workstation name to %s: %s\n", 
-			  workstation, nt_errstr(status)));
+			  cli_credentials_get_workstation(credentials), nt_errstr(status)));
 		return status;
 	}
 
-	status = gensec_set_domain(p->conn->security_state.generic_state, domain);
+	status = gensec_set_domain(p->conn->security_state.generic_state, 
+							   cli_credentials_get_domain(credentials));
 	if (!NT_STATUS_IS_OK(status)) {
 		DEBUG(1, ("Failed to start set GENSEC client domain to %s: %s\n", 
-			  domain, nt_errstr(status)));
+			  cli_credentials_get_domain(credentials), nt_errstr(status)));
 		return status;
 	}
 
-	status = gensec_set_username(p->conn->security_state.generic_state, username);
+	status = gensec_set_username(p->conn->security_state.generic_state, 
+								 cli_credentials_get_username(credentials));
 	if (!NT_STATUS_IS_OK(status)) {
 		DEBUG(1, ("Failed to start set GENSEC client username to %s: %s\n", 
-			  username, nt_errstr(status)));
+			  cli_credentials_get_username(credentials), nt_errstr(status)));
 		return status;
 	}
 
-	status = gensec_set_password(p->conn->security_state.generic_state, password);
+	status = gensec_set_password(p->conn->security_state.generic_state, 
+								 cli_credentials_get_password(credentials));
 	if (!NT_STATUS_IS_OK(status)) {
 		DEBUG(1, ("Failed to start set GENSEC client password: %s\n", 
 			  nt_errstr(status)));