summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2004-11-08 02:01:05 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:05:38 -0500
commit009892846fb25e6698c8e38c46cae3512abb7ec6 (patch)
tree1cc1b7ca3e8d60904a763514cb70cd99e756c044 /source4
parent438ca20a3c415d05bb796a3c59bddf5a649bcc5e (diff)
downloadsamba-009892846fb25e6698c8e38c46cae3512abb7ec6.tar.gz
samba-009892846fb25e6698c8e38c46cae3512abb7ec6.tar.bz2
samba-009892846fb25e6698c8e38c46cae3512abb7ec6.zip
r3610: prevent segv with heimdal and password krb5 init
(This used to be commit a4598e7fa17c7ec0fed9cb81f5a0fb30b133861b)
Diffstat (limited to 'source4')
-rw-r--r--source4/libcli/auth/kerberos.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/source4/libcli/auth/kerberos.c b/source4/libcli/auth/kerberos.c
index d70444d5bc..224e4abbdc 100644
--- a/source4/libcli/auth/kerberos.c
+++ b/source4/libcli/auth/kerberos.c
@@ -61,14 +61,17 @@ kerb_prompter(krb5_context ctx, void *data,
krb5_error_code code = 0;
krb5_principal me;
krb5_creds my_creds;
+ krb5_get_init_creds_opt options;
if ((code = krb5_parse_name(ctx, principal, &me))) {
return code;
}
-
+
+ ZERO_STRUCT(options);
+
if ((code = krb5_get_init_creds_password(ctx, &my_creds, me, password,
kerb_prompter,
- NULL, 0, NULL, NULL))) {
+ NULL, 0, NULL, &options))) {
krb5_free_principal(ctx, me);
return code;
}