summaryrefslogtreecommitdiff
path: root/source4/gtk
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2005-08-30 01:19:41 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:34:59 -0500
commit6f9b901fa0db18faae603db67d8d31e229d92c27 (patch)
tree8c54a8369d17994a8ef087c95038b81d87f50352 /source4/gtk
parentc0293aa7159c8b5c9f1a1b13f64af08e5a55ad6a (diff)
downloadsamba-6f9b901fa0db18faae603db67d8d31e229d92c27.tar.gz
samba-6f9b901fa0db18faae603db67d8d31e229d92c27.tar.bz2
samba-6f9b901fa0db18faae603db67d8d31e229d92c27.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 (This used to be commit 04af95bd31de39ad6aff349a4838dd77cb300034)
Diffstat (limited to 'source4/gtk')
-rw-r--r--source4/gtk/common/credentials.c17
1 files changed, 3 insertions, 14 deletions
diff --git a/source4/gtk/common/credentials.c b/source4/gtk/common/credentials.c
index ccc9759e8f..01132ec6bd 100644
--- a/source4/gtk/common/credentials.c
+++ b/source4/gtk/common/credentials.c
@@ -132,18 +132,7 @@ static const char *gtk_get_domain(struct cli_credentials *credentials)
void cli_credentials_set_gtk_callbacks(struct cli_credentials *cred)
{
- if (cred->password_obtained <= CRED_CALLBACK) {
- cred->password_cb = gtk_get_userpassword;
- cred->password_obtained = CRED_CALLBACK;
- }
-
- if (cred->username_obtained <= CRED_CALLBACK) {
- cred->username_cb = gtk_get_username;
- cred->username_obtained = CRED_CALLBACK;
- }
-
- if (cred->domain_obtained <= CRED_CALLBACK) {
- cred->domain_cb = gtk_get_domain;
- cred->domain_obtained = CRED_CALLBACK;
- }
+ cli_credentials_set_username_callback(cred, gtk_get_username);
+ cli_credentials_set_domain_callback(cred, gtk_get_domain);
+ cli_credentials_set_password_callback(cred, gtk_get_userpassword);
}