Remove pwd_cache.c, it was doing nothing. Make user_name, domain, and

password talloc'ed strings within the cli_struct.
Jeremy.

3 files changed, 7 insertions, 16 deletions

diff --git a/source3/include/client.h b/source3/include/client.h
index eae22fdbce..320a90e66b 100644
--- a/source3/include/client.h
+++ b/source3/include/client.h
@@ -187,9 +187,9 @@ struct cli_state {
 	fstring desthost;
 
 	/* The credentials used to open the cli_state connection. */
-	fstring domain;
-	fstring user_name;
-	struct pwd_info pwd;
+	char *domain;
+	char *user_name;
+	char *password; /* Can be null to force use of zero NTLMSSP session key. */
 
 	/*
 	 * The following strings are the
diff --git a/source3/include/proto.h b/source3/include/proto.h
index 5811574068..f992f0686a 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -2424,7 +2424,10 @@ bool cli_send_smb_direct_writeX(struct cli_state *cli,
 void cli_setup_packet_buf(struct cli_state *cli, char *buf);
 void cli_setup_packet(struct cli_state *cli);
 void cli_setup_bcc(struct cli_state *cli, void *p);
-void cli_init_creds(struct cli_state *cli, const char *username, const char *domain, const char *password);
+NTSTATUS cli_set_domain(struct cli_state *cli, const char *domain);
+NTSTATUS cli_set_username(struct cli_state *cli, const char *username);
+NTSTATUS cli_set_password(struct cli_state *cli, const char *password);
+NTSTATUS cli_init_creds(struct cli_state *cli, const char *username, const char *domain, const char *password);
 struct cli_state *cli_initialise(void);
 struct cli_state *cli_initialise_ex(int signing_state);
 void cli_nt_pipes_close(struct cli_state *cli);
@@ -3154,11 +3157,6 @@ NTSTATUS remote_password_change(const char *remote_machine, const char *user_nam
 				const char *old_passwd, const char *new_passwd,
 				char **err_str);
 
-/* The following definitions come from libsmb/pwd_cache.c  */
-
-void pwd_set_cleartext(struct pwd_info *pwd, const char *clr);
-void pwd_get_cleartext(struct pwd_info *pwd, fstring clr);
-
 /* The following definitions come from libsmb/samlogon_cache.c  */
 
 bool netsamlogon_cache_init(void);
diff --git a/source3/include/smb.h b/source3/include/smb.h
index a0140fe081..281a218256 100644
--- a/source3/include/smb.h
+++ b/source3/include/smb.h
@@ -1759,13 +1759,6 @@ struct node_status_extra {
 	/* There really is more here ... */ 
 };
 
-struct pwd_info {
-	bool null_pwd;
-	bool cleartext;
-
-	fstring password;
-};
-
 /* For split krb5 SPNEGO blobs. */
 struct pending_auth_data {
 	struct pending_auth_data *prev, *next;