summaryrefslogtreecommitdiff
path: root/source3/libsmb
diff options
context:
space:
mode:
authorGerald Carter <jerry@samba.org>2004-07-08 15:36:23 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 10:52:10 -0500
commit824bc32be71afafdbaaea94a6cf104a1b3d329ec (patch)
treecd6099fb10bd35bf536824b3a1b16bcfc885bdc4 /source3/libsmb
parent8c518daa86518f5752b1f571f08bd34b0143d10e (diff)
downloadsamba-824bc32be71afafdbaaea94a6cf104a1b3d329ec.tar.gz
samba-824bc32be71afafdbaaea94a6cf104a1b3d329ec.tar.bz2
samba-824bc32be71afafdbaaea94a6cf104a1b3d329ec.zip
r1399: applying heimdal krb5 fixes from Guenther and fixing compile warnings in libadskerberos_keyatb.c
(This used to be commit 837f56ec8bc171497fb84d332002776313c26305)
Diffstat (limited to 'source3/libsmb')
-rw-r--r--source3/libsmb/clikrb5.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/source3/libsmb/clikrb5.c b/source3/libsmb/clikrb5.c
index 4929bd63ef..abb1eb4acb 100644
--- a/source3/libsmb/clikrb5.c
+++ b/source3/libsmb/clikrb5.c
@@ -425,7 +425,9 @@ failed:
SuSE 9.1 Pro
*/
if (ccdef)
+#if 0 /* redisabled by gd :) at least until any official heimdal version has it fixed. */
krb5_cc_close(context, ccdef);
+#endif
if (auth_context)
krb5_auth_con_free(context, auth_context);
krb5_free_context(context);
@@ -473,7 +475,7 @@ failed:
}
#endif
- krb5_error_code smb_krb5_kt_free_entry(krb5_context context, krb5_keytab_entry *kt_entry)
+krb5_error_code smb_krb5_kt_free_entry(krb5_context context, krb5_keytab_entry *kt_entry)
{
#if defined(HAVE_KRB5_KT_FREE_ENTRY)
return krb5_kt_free_entry(context, kt_entry);