From 116bc3cde4d3cec4edf77792b299ab70aa5c9dc4 Mon Sep 17 00:00:00 2001 From: Unknown User d91-jda Date: Mon, 18 Mar 1996 00:38:19 +0000 Subject: [PATCH] *** empty log message *** git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@310 ec53bebd-3082-4978-b11e-865c3cabbd6b --- cache.c | 18 ++++++++---------- lib/krb5/cache.c | 18 ++++++++---------- 2 files changed, 16 insertions(+), 20 deletions(-) diff --git a/cache.c b/cache.c index 387c6c600..09d3aefcd 100644 --- a/cache.c +++ b/cache.c @@ -317,14 +317,14 @@ krb5_cc_initialize(krb5_context context, int ret; int fd; - krb5_fcache *f; + char *f; - f = (krb5_fcache*)id->data.data; + f = krb5_cc_get_name(context, id); - if(ret = erase_file(f->filename)) + if(ret = erase_file(f)) return ret; - fd = open(f->filename, O_RDWR | O_CREAT | O_EXCL, 0600); + fd = open(f, O_RDWR | O_CREAT | O_EXCL, 0600); if(fd == -1) return errno; store_int16(fd, 0x503); @@ -359,15 +359,13 @@ krb5_error_code krb5_cc_destroy(krb5_context context, krb5_ccache id) { - krb5_fcache *f; + char *f; int ret; - f = (krb5_fcache*)id->data.data; + f = krb5_cc_get_name(context, id); - ret = erase_file(f->filename); + ret = erase_file(f); - free(f->filename); - free(f); - free(id); + krb5_free_ccache(id); return ret; } diff --git a/lib/krb5/cache.c b/lib/krb5/cache.c index 387c6c600..09d3aefcd 100644 --- a/lib/krb5/cache.c +++ b/lib/krb5/cache.c @@ -317,14 +317,14 @@ krb5_cc_initialize(krb5_context context, int ret; int fd; - krb5_fcache *f; + char *f; - f = (krb5_fcache*)id->data.data; + f = krb5_cc_get_name(context, id); - if(ret = erase_file(f->filename)) + if(ret = erase_file(f)) return ret; - fd = open(f->filename, O_RDWR | O_CREAT | O_EXCL, 0600); + fd = open(f, O_RDWR | O_CREAT | O_EXCL, 0600); if(fd == -1) return errno; store_int16(fd, 0x503); @@ -359,15 +359,13 @@ krb5_error_code krb5_cc_destroy(krb5_context context, krb5_ccache id) { - krb5_fcache *f; + char *f; int ret; - f = (krb5_fcache*)id->data.data; + f = krb5_cc_get_name(context, id); - ret = erase_file(f->filename); + ret = erase_file(f); - free(f->filename); - free(f); - free(id); + krb5_free_ccache(id); return ret; }