summaryrefslogtreecommitdiff
path: root/source4/auth
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2005-10-20 10:10:40 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:45:03 -0500
commit10989431e533bd60de242dbd78c4b62c4ace7812 (patch)
tree0bc2742a274b955fa49193e18242dc22065a4a99 /source4/auth
parentf4d590662effeb80c2b55ae5ad869b4b7810cf08 (diff)
downloadsamba-10989431e533bd60de242dbd78c4b62c4ace7812.tar.gz
samba-10989431e533bd60de242dbd78c4b62c4ace7812.tar.bz2
samba-10989431e533bd60de242dbd78c4b62c4ace7812.zip
r11215: Remove no-op prompter intended to work around bugs in old kerberos libs.
I'm also worried this might cause loops, if we get a 'force password change', and the prompter tries to 'deal with it'. Andrew Bartlett (This used to be commit 5bc10c4e472b45c5b5b0ea0c3dd100be6f4dabca)
Diffstat (limited to 'source4/auth')
-rw-r--r--source4/auth/kerberos/kerberos.c28
1 files changed, 1 insertions, 27 deletions
diff --git a/source4/auth/kerberos/kerberos.c b/source4/auth/kerberos/kerberos.c
index 62614f7081..71d9859df6 100644
--- a/source4/auth/kerberos/kerberos.c
+++ b/source4/auth/kerberos/kerberos.c
@@ -35,32 +35,6 @@
#define LIBADS_CCACHE_NAME "MEMORY:libads"
/*
- we use a prompter to avoid a crash bug in the kerberos libs when
- dealing with empty passwords
- this prompter is just a string copy ...
-*/
-static krb5_error_code
-kerb_prompter(krb5_context ctx, void *data,
- const char *name,
- const char *banner,
- int num_prompts,
- krb5_prompt prompts[])
-{
- if (num_prompts == 0) return 0;
-
- memset(prompts[0].reply->data, '\0', prompts[0].reply->length);
- if (prompts[0].reply->length > 0) {
- if (data) {
- strncpy(prompts[0].reply->data, data, prompts[0].reply->length-1);
- prompts[0].reply->length = strlen(prompts[0].reply->data);
- } else {
- prompts[0].reply->length = 0;
- }
- }
- return 0;
-}
-
-/*
simulate a kinit, putting the tgt in the given credentials cache.
Orignally by remus@snapserver.com
@@ -120,7 +94,7 @@ kerb_prompter(krb5_context ctx, void *data,
krb5_get_init_creds_opt_init(&options);
if ((code = krb5_get_init_creds_password(ctx, &my_creds, principal, password,
- kerb_prompter,
+ NULL,
NULL, 0, NULL, &options))) {
return code;
}