summaryrefslogtreecommitdiffstats
path: root/source/lib/cmdline/credentials.c
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2005-08-30 01:19:41 +0000
committerAndrew Bartlett <abartlet@samba.org>2005-08-30 01:19:41 +0000
commitcf10def61d40d7ecf7c42d9509a8f659a73b81f3 (patch)
tree6aa1e3f30f417c0714372b0b373ee6b41aa77535 /source/lib/cmdline/credentials.c
parent814ea5b90d445b2d59f17f85a53f33ceb39a50ea (diff)
downloadsamba-cf10def61d40d7ecf7c42d9509a8f659a73b81f3.tar.gz
samba-cf10def61d40d7ecf7c42d9509a8f659a73b81f3.tar.xz
samba-cf10def61d40d7ecf7c42d9509a8f659a73b81f3.zip
r9772: Make credentials callbacks more consistant with the abstraction
function interface used in the credentials code. Fix bug in ntlm_auth, where we would overwrite the PW specified as a first input. (Reported and chased by Kai Blin <blin@gmx.net>, bug #3040) Andrew Bartlett
Diffstat (limited to 'source/lib/cmdline/credentials.c')
-rw-r--r--source/lib/cmdline/credentials.c9
1 files changed, 3 insertions, 6 deletions
diff --git a/source/lib/cmdline/credentials.c b/source/lib/cmdline/credentials.c
index 7832e01e4bb..f46a03b2365 100644
--- a/source/lib/cmdline/credentials.c
+++ b/source/lib/cmdline/credentials.c
@@ -29,8 +29,8 @@ static const char *cmdline_get_userpassword(struct cli_credentials *credentials)
{
char *prompt;
char *ret;
- char *domain;
- char *username;
+ const char *domain;
+ const char *username;
TALLOC_CTX *mem_ctx = talloc_new(NULL);
domain = cli_credentials_get_domain(credentials);
@@ -51,8 +51,5 @@ static const char *cmdline_get_userpassword(struct cli_credentials *credentials)
void cli_credentials_set_cmdline_callbacks(struct cli_credentials *cred)
{
- if (cred->password_obtained <= CRED_CALLBACK) {
- cred->password_cb = cmdline_get_userpassword;
- cred->password_obtained = CRED_CALLBACK;
- }
+ cli_credentials_set_password_callback(cred, cmdline_get_userpassword);
}