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

Rename PA-KEY-INFO -> ETYPE-INFO. Better cleanup on errors.

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@4615 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Johan Danielsson
1998-03-21 00:47:35 +00:00
parent 05a5c19e41
commit 4dd652b0a9
1 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
lib/krb5/init_creds_pw.c
View File

@@ -424,6 +424,7 @@ krb5_get_init_creds_password(krb5_context context,
done = 0; done = 0;
while(!done) { while(!done) {
memset(&kdc_reply, 0, sizeof(kdc_reply));
ret = krb5_get_in_cred (context, ret = krb5_get_in_cred (context,
flags.i, flags.i,
addrs, addrs,
@@ -467,23 +468,26 @@ krb5_get_init_creds_password(krb5_context context,
if (pre_auth_types) if (pre_auth_types)
free (pre_auth_types); free (pre_auth_types);
ALLOC(pre_auth_types, 2); ALLOC(pre_auth_types, 2);
if (pre_auth_types == NULL) if (pre_auth_types == NULL) {
free_METHOD_DATA(&md);
goto out; goto out;
}
pre_auth_types[0] = KRB5_PADATA_ENC_TIMESTAMP; pre_auth_types[0] = KRB5_PADATA_ENC_TIMESTAMP;
pre_auth_types[1] = 0; pre_auth_types[1] = 0;
break; break;
case pa_key_info: case pa_etype_info:
preauth = &preauth2; preauth = &preauth2;
ALLOC_SEQ(preauth, 1); ALLOC_SEQ(preauth, 1);
preauth->val[0].type = KRB5_PADATA_ENC_TIMESTAMP; preauth->val[0].type = KRB5_PADATA_ENC_TIMESTAMP;
krb5_decode_PA_KEY_INFO(context, krb5_decode_ETYPE_INFO(context,
md.val[i].padata_value.data, md.val[i].padata_value.data,
md.val[i].padata_value.length, md.val[i].padata_value.length,
&preauth->val[0].info, &preauth->val[0].info,
NULL); NULL);
break; break;
} }
} }
free_METHOD_DATA(&md);
}else{ }else{
if (pre_auth_types) if (pre_auth_types)
free (pre_auth_types); free (pre_auth_types);
@@ -493,6 +497,7 @@ krb5_get_init_creds_password(krb5_context context,
pre_auth_types[0] = KRB5_PADATA_ENC_TIMESTAMP; pre_auth_types[0] = KRB5_PADATA_ENC_TIMESTAMP;
pre_auth_types[1] = 0; pre_auth_types[1] = 0;
} }
krb5_free_kdc_rep (context, &kdc_reply);
break; break;
} }
default: default:
@@ -506,25 +511,20 @@ krb5_get_init_creds_password(krb5_context context,
&kdc_reply, &kdc_reply,
prompter, prompter,
data); data);
out:
memset (buf, 0, sizeof(buf));
krb5_free_kdc_rep (context, &kdc_reply); krb5_free_kdc_rep (context, &kdc_reply);
free (pre_auth_types);
free (etypes);
if (creds)
*creds = this_cred;
else
krb5_free_creds_contents (context, &this_cred);
return 0;
out:
memset (buf, 0, sizeof(buf));
free (pre_auth_types); free (pre_auth_types);
if(preauth) { if(preauth) {
free_PA_KEY_INFO(&preauth->val[0].info); free_ETYPE_INFO(&preauth->val[0].info);
free(preauth->val); free(preauth->val);
} }
free (etypes); free (etypes);
krb5_free_creds_contents (context, &this_cred); if (ret == 0 && creds)
*creds = this_cred;
else
krb5_free_creds_contents (context, &this_cred);
return ret; return ret;
} }