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

pa_* -> KRB5_PADATA_*

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@8401 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Johan Danielsson
2000-06-19 15:28:48 +00:00
parent 983c4c2e68
commit def1f13529
2 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/krb5/get_cred.c
View File

@@ -87,7 +87,7 @@ out:
free (buf); free (buf);
if(ret) if(ret)
return ret; return ret;
padata->padata_type = pa_tgs_req; padata->padata_type = KRB5_PADATA_TGS_REQ;
return 0; return 0;
} }
@@ -191,6 +191,10 @@ init_tgs_req (krb5_context context,
ret = ENOMEM; ret = ENOMEM;
goto fail; goto fail;
} }
/* some versions of some code might require that the client be
present in TGS-REQs, but this is clearly against the spec */
ret = copy_PrincipalName(&in_creds->server->name, t->req_body.sname); ret = copy_PrincipalName(&in_creds->server->name, t->req_body.sname);
if (ret) if (ret)
goto fail; goto fail;

12
lib/krb5/get_in_tkt.c
View File

@@ -340,7 +340,7 @@ make_pa_enc_timestamp(krb5_context context, PA_DATA *pa,
free_EncryptedData(&encdata); free_EncryptedData(&encdata);
if (ret) if (ret)
return ret; return ret;
pa->padata_type = pa_enc_timestamp; pa->padata_type = KRB5_PADATA_ENC_TIMESTAMP;
pa->padata_value.length = 0; pa->padata_value.length = 0;
krb5_data_copy(&pa->padata_value, krb5_data_copy(&pa->padata_value,
buf + sizeof(buf) - len, buf + sizeof(buf) - len,
@@ -582,10 +582,10 @@ set_ptypes(krb5_context context,
NULL); NULL);
for(i = 0; i < md.len; i++){ for(i = 0; i < md.len; i++){
switch(md.val[i].padata_type){ switch(md.val[i].padata_type){
case pa_enc_timestamp: case KRB5_PADATA_ENC_TIMESTAMP:
*ptypes = ptypes2; *ptypes = ptypes2;
break; break;
case pa_etype_info: case KRB5_PADATA_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;
@@ -595,6 +595,8 @@ set_ptypes(krb5_context context,
&(*preauth)->val[0].info, &(*preauth)->val[0].info,
NULL); NULL);
break; break;
default:
break;
} }
} }
free_METHOD_DATA(&md); free_METHOD_DATA(&md);
@@ -714,12 +716,12 @@ krb5_get_in_cred(krb5_context context,
if(rep.kdc_rep.padata){ if(rep.kdc_rep.padata){
int index = 0; int index = 0;
pa = krb5_find_padata(rep.kdc_rep.padata->val, rep.kdc_rep.padata->len, pa = krb5_find_padata(rep.kdc_rep.padata->val, rep.kdc_rep.padata->len,
pa_pw_salt, &index); KRB5_PADATA_PW_SALT, &index);
if(pa == NULL) { if(pa == NULL) {
index = 0; index = 0;
pa = krb5_find_padata(rep.kdc_rep.padata->val, pa = krb5_find_padata(rep.kdc_rep.padata->val,
rep.kdc_rep.padata->len, rep.kdc_rep.padata->len,
pa_afs3_salt, &index); KRB5_PADATA_AFS3_SALT, &index);
} }
} }
if(pa) { if(pa) {