oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

(fcc_initialize, fcc_store_cred): verify that stores and close succeed

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@7982 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Assar Westerlund
2000-02-24 14:46:53 +00:00
parent bbdf3d4912
commit ee1912847a
1 changed files with 21 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
lib/krb5/fcache.c
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright (c) 1997, 1998, 1999 Kungliga Tekniska H<>gskolan * Copyright (c) 1997 - 2000 Kungliga Tekniska H<>gskolan
* (Royal Institute of Technology, Stockholm, Sweden). * (Royal Institute of Technology, Stockholm, Sweden).
* All rights reserved. * All rights reserved.
* *
@@ -183,27 +183,29 @@ fcc_initialize(krb5_context context,
f->version = context->fcache_vno; f->version = context->fcache_vno;
else else
f->version = KRB5_FCC_FVNO_4; f->version = KRB5_FCC_FVNO_4;
krb5_store_int8(sp, 5); ret |= krb5_store_int8(sp, 5);
krb5_store_int8(sp, f->version); ret |= krb5_store_int8(sp, f->version);
storage_set_flags(context, sp, f->version); storage_set_flags(context, sp, f->version);
if(f->version == KRB5_FCC_FVNO_4) { if(f->version == KRB5_FCC_FVNO_4 && ret == 0) {
/* V4 stuff */ /* V4 stuff */
if (context->kdc_sec_offset) { if (context->kdc_sec_offset) {
krb5_store_int16 (sp, 12); /* length */ ret |= krb5_store_int16 (sp, 12); /* length */
krb5_store_int16 (sp, FCC_TAG_DELTATIME); /* Tag */ ret |= krb5_store_int16 (sp, FCC_TAG_DELTATIME); /* Tag */
krb5_store_int16 (sp, 8); /* length of data */ ret |= krb5_store_int16 (sp, 8); /* length of data */
krb5_store_int32 (sp, context->kdc_sec_offset); ret |= krb5_store_int32 (sp, context->kdc_sec_offset);
krb5_store_int32 (sp, context->kdc_usec_offset); ret |= krb5_store_int32 (sp, context->kdc_usec_offset);
} else { } else {
krb5_store_int16 (sp, 0); ret |= krb5_store_int16 (sp, 0);
} }
} }
krb5_store_principal(sp, primary_principal); ret |= krb5_store_principal(sp, primary_principal);
krb5_storage_free(sp); krb5_storage_free(sp);
} }
close(fd); if(close(fd) < 0)
if (ret == 0)
ret = errno;
return 0; return ret;
} }
static krb5_error_code static krb5_error_code
@@ -232,6 +234,7 @@ fcc_store_cred(krb5_context context,
krb5_ccache id, krb5_ccache id,
krb5_creds *creds) krb5_creds *creds)
{ {
int ret;
int fd; int fd;
char *f; char *f;
@@ -244,11 +247,13 @@ fcc_store_cred(krb5_context context,
krb5_storage *sp; krb5_storage *sp;
sp = krb5_storage_from_fd(fd); sp = krb5_storage_from_fd(fd);
storage_set_flags(context, sp, FCACHE(id)->version); storage_set_flags(context, sp, FCACHE(id)->version);
krb5_store_creds(sp, creds); ret = krb5_store_creds(sp, creds);
krb5_storage_free(sp); krb5_storage_free(sp);
} }
close(fd); if (close(fd) < 0)
return 0; /* XXX */ if (ret == 0)
ret = errno;
return ret;
} }
static krb5_error_code static krb5_error_code