diff options
Diffstat (limited to 'crypto/heimdal/lib/krb5/get_in_tkt.c')
| -rw-r--r-- | crypto/heimdal/lib/krb5/get_in_tkt.c | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/crypto/heimdal/lib/krb5/get_in_tkt.c b/crypto/heimdal/lib/krb5/get_in_tkt.c index aa72bbc..04587ea 100644 --- a/crypto/heimdal/lib/krb5/get_in_tkt.c +++ b/crypto/heimdal/lib/krb5/get_in_tkt.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997 - 2001 Kungliga Tekniska Högskolan + * Copyright (c) 1997 - 2002 Kungliga Tekniska Högskolan * (Royal Institute of Technology, Stockholm, Sweden). * All rights reserved. * @@ -33,7 +33,7 @@ #include "krb5_locl.h" -RCSID("$Id: get_in_tkt.c,v 1.103 2002/01/06 23:10:06 assar Exp $"); +RCSID("$Id: get_in_tkt.c,v 1.104 2002/04/18 09:11:39 joda Exp $"); krb5_error_code krb5_init_etype (krb5_context context, @@ -43,19 +43,18 @@ krb5_init_etype (krb5_context context, { int i; krb5_error_code ret; - krb5_enctype *tmp; + krb5_enctype *tmp = NULL; ret = 0; - if (etypes) - tmp = (krb5_enctype*)etypes; - else { + if (etypes == NULL) { ret = krb5_get_default_in_tkt_etypes(context, &tmp); if (ret) return ret; + etypes = tmp; } - for (i = 0; tmp[i]; ++i) + for (i = 0; etypes[i]; ++i) ; *len = i; *val = malloc(i * sizeof(**val)); @@ -65,10 +64,10 @@ krb5_init_etype (krb5_context context, goto cleanup; } memmove (*val, - tmp, + etypes, i * sizeof(*tmp)); cleanup: - if (etypes == NULL) + if (tmp != NULL) free (tmp); return ret; } |
