summaryrefslogtreecommitdiff
path: root/source3/libsmb
diff options
context:
space:
mode:
authorGerald Carter <jerry@samba.org>2004-05-07 02:48:03 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 10:51:28 -0500
commit63378d6f0efa4612da1aecb5dee14992ac069d0f (patch)
tree380dffa82cd416960fdea169e622bb9726562f9a /source3/libsmb
parent675ecdd5babbcf2d87e807e21375a4c0d81dfa14 (diff)
downloadsamba-63378d6f0efa4612da1aecb5dee14992ac069d0f.tar.gz
samba-63378d6f0efa4612da1aecb5dee14992ac069d0f.tar.bz2
samba-63378d6f0efa4612da1aecb5dee14992ac069d0f.zip
r541: fixing segfault in winbindd caused -r527 -- looks like a bug in heimdal; also initialize some pointers
(This used to be commit be74e88d9a4b74fcaf25b0816e3fa8a487c91ab5)
Diffstat (limited to 'source3/libsmb')
-rw-r--r--source3/libsmb/clikrb5.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/source3/libsmb/clikrb5.c b/source3/libsmb/clikrb5.c
index e688ad608c..9027f192ef 100644
--- a/source3/libsmb/clikrb5.c
+++ b/source3/libsmb/clikrb5.c
@@ -359,7 +359,7 @@ int cli_krb5_get_ticket(const char *principal, time_t time_offset,
{
krb5_error_code retval;
krb5_data packet;
- krb5_context context;
+ krb5_context context = NULL;
krb5_ccache ccdef = NULL;
krb5_auth_context auth_context = NULL;
krb5_enctype enc_types[] = {
@@ -413,8 +413,11 @@ int cli_krb5_get_ticket(const char *principal, time_t time_offset,
failed:
if ( context ) {
+#if 0 /* JERRY -- disabled since it causes heimdal 0.6.1rc3 to die
+ SuSE 9.1 Pro */
if (ccdef)
krb5_cc_close(context, ccdef);
+#endif
if (auth_context)
krb5_auth_con_free(context, auth_context);
krb5_free_context(context);