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

When returning a new error code, either set error string or clear it

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@15327 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Love Hörnquist Åstrand
2005-05-31 22:06:15 +00:00
parent 897ad7f8f3
commit ea4a3e5660
1 changed files with 19 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
lib/krb5/fcache.c
View File

@@ -450,12 +450,12 @@ init_fcc (krb5_context context,
krb5_error_code ret; krb5_error_code ret;
ret = fcc_open(context, id, &fd, O_RDONLY | O_BINARY, 0); ret = fcc_open(context, id, &fd, O_RDONLY | O_BINARY, 0);
if(ret) if(ret)
return ret; return ret;
sp = krb5_storage_from_fd(fd); sp = krb5_storage_from_fd(fd);
if(sp == NULL) { if(sp == NULL) {
krb5_clear_error_string(context);
ret = ENOMEM; ret = ENOMEM;
goto out; goto out;
} }
@@ -464,14 +464,18 @@ init_fcc (krb5_context context,
if(ret != 0) { if(ret != 0) {
if(ret == KRB5_CC_END) if(ret == KRB5_CC_END)
ret = ENOENT; /* empty file */ ret = ENOENT; /* empty file */
krb5_clear_error_string(context);
goto out; goto out;
} }
if(pvno != 5) { if(pvno != 5) {
krb5_set_error_string(context, "Bad version number in credential "
"cache file: %s", FILENAME(id));
ret = KRB5_CCACHE_BADVNO; ret = KRB5_CCACHE_BADVNO;
goto out; goto out;
} }
ret = krb5_ret_int8(sp, &tag); /* should not be host byte order */ ret = krb5_ret_int8(sp, &tag); /* should not be host byte order */
if(ret != 0) { if(ret != 0) {
krb5_clear_error_string(context);
ret = KRB5_CC_FORMAT; ret = KRB5_CC_FORMAT;
goto out; goto out;
} }
@@ -484,6 +488,7 @@ init_fcc (krb5_context context,
ret = krb5_ret_int16 (sp, &length); ret = krb5_ret_int16 (sp, &length);
if(ret) { if(ret) {
ret = KRB5_CC_FORMAT; ret = KRB5_CC_FORMAT;
krb5_clear_error_string(context);
goto out; goto out;
} }
while(length > 0) { while(length > 0) {
@@ -493,11 +498,13 @@ init_fcc (krb5_context context,
ret = krb5_ret_int16 (sp, &tag); ret = krb5_ret_int16 (sp, &tag);
if(ret) { if(ret) {
krb5_clear_error_string(context);
ret = KRB5_CC_FORMAT; ret = KRB5_CC_FORMAT;
goto out; goto out;
} }
ret = krb5_ret_int16 (sp, &data_len); ret = krb5_ret_int16 (sp, &data_len);
if(ret) { if(ret) {
krb5_clear_error_string(context);
ret = KRB5_CC_FORMAT; ret = KRB5_CC_FORMAT;
goto out; goto out;
} }
@@ -505,11 +512,13 @@ init_fcc (krb5_context context,
case FCC_TAG_DELTATIME : case FCC_TAG_DELTATIME :
ret = krb5_ret_int32 (sp, &context->kdc_sec_offset); ret = krb5_ret_int32 (sp, &context->kdc_sec_offset);
if(ret) { if(ret) {
krb5_clear_error_string(context);
ret = KRB5_CC_FORMAT; ret = KRB5_CC_FORMAT;
goto out; goto out;
} }
ret = krb5_ret_int32 (sp, &context->kdc_usec_offset); ret = krb5_ret_int32 (sp, &context->kdc_usec_offset);
if(ret) { if(ret) {
krb5_clear_error_string(context);
ret = KRB5_CC_FORMAT; ret = KRB5_CC_FORMAT;
goto out; goto out;
} }
@@ -518,6 +527,7 @@ init_fcc (krb5_context context,
for (i = 0; i < data_len; ++i) { for (i = 0; i < data_len; ++i) {
ret = krb5_ret_int8 (sp, &dummy); ret = krb5_ret_int8 (sp, &dummy);
if(ret) { if(ret) {
krb5_clear_error_string(context);
ret = KRB5_CC_FORMAT; ret = KRB5_CC_FORMAT;
goto out; goto out;
} }
@@ -534,6 +544,9 @@ init_fcc (krb5_context context,
break; break;
default : default :
ret = KRB5_CCACHE_BADVNO; ret = KRB5_CCACHE_BADVNO;
krb5_set_error_string(context, "Unknown version number (%d) in "
"credential cache file: %s",
(int)tag, FILENAME(id));
goto out; goto out;
} }
*ret_sp = sp; *ret_sp = sp;
@@ -561,6 +574,8 @@ fcc_get_principal(krb5_context context,
if (ret) if (ret)
return ret; return ret;
ret = krb5_ret_principal(sp, principal); ret = krb5_ret_principal(sp, principal);
if (ret)
krb5_clear_error_string(context);
krb5_storage_free(sp); krb5_storage_free(sp);
fcc_unlock(context, fd); fcc_unlock(context, fd);
close(fd); close(fd);
@@ -596,6 +611,7 @@ fcc_get_first (krb5_context context,
} }
ret = krb5_ret_principal (FCC_CURSOR(*cursor)->sp, &principal); ret = krb5_ret_principal (FCC_CURSOR(*cursor)->sp, &principal);
if(ret) { if(ret) {
krb5_clear_error_string(context);
fcc_end_get(context, id, cursor); fcc_end_get(context, id, cursor);
return ret; return ret;
} }
@@ -615,6 +631,8 @@ fcc_get_next (krb5_context context,
return ret; return ret;
ret = krb5_ret_creds(FCC_CURSOR(*cursor)->sp, creds); ret = krb5_ret_creds(FCC_CURSOR(*cursor)->sp, creds);
if (ret)
krb5_clear_error_string(context);
fcc_unlock(context, FCC_CURSOR(*cursor)->fd); fcc_unlock(context, FCC_CURSOR(*cursor)->fd);
return ret; return ret;