merge new-crypto branch

git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@5332 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Johan Danielsson
1999-02-11 21:03:59 +00:00
parent 0a6c3f7fde
commit aaae186ab9
83 changed files with 4175 additions and 1509 deletions

View File

@@ -1,5 +1,5 @@
/*
* Copyright (c) 1997 Kungliga Tekniska H<>gskolan
* Copyright (c) 1997, 1998 Kungliga Tekniska H<>gskolan
* (Royal Institute of Technology, Stockholm, Sweden).
* All rights reserved.
*
@@ -93,7 +93,7 @@ krb5_cc_resolve(krb5_context context,
if(ret) return ret;
}
for(i = 0; context->cc_ops[i].prefix && i < context->num_ops; i++)
for(i = 0; i < context->num_ops && context->cc_ops[i].prefix; i++)
if(strncmp(context->cc_ops[i].prefix, residual,
strlen(context->cc_ops[i].prefix)) == 0){
krb5_ccache p;
@@ -187,9 +187,6 @@ krb5_cc_close(krb5_context context,
{
krb5_error_code ret;
ret = id->ops->close(context, id);
#if 0 /* XXX */
free(id->residual);
#endif
free(id);
return ret;
}