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@8409 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Johan Danielsson
2000-06-19 16:11:31 +00:00
parent 41ee03a0d9
commit 328af4c318
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
kdc/kerberos5.c
View File

@@ -310,7 +310,7 @@ get_pa_etype_info(METHOD_DATA *md, hdb_entry *client)
#if 0 #if 0
*pa.val[i].salttype = 1; /* or 0 with salt? */ *pa.val[i].salttype = 1; /* or 0 with salt? */
#else #else
*pa.val[i].salttype = pa_pw_salt; *pa.val[i].salttype = KRB5_PADATA_PW_SALT;
#endif #endif
pa.val[i].salt = NULL; pa.val[i].salt = NULL;
} }
@@ -332,7 +332,7 @@ get_pa_etype_info(METHOD_DATA *md, hdb_entry *client)
free(buf); free(buf);
return ret; return ret;
} }
md->val[md->len - 1].padata_type = pa_etype_info; md->val[md->len - 1].padata_type = KRB5_PADATA_ETYPE_INFO;
md->val[md->len - 1].padata_value.length = len; md->val[md->len - 1].padata_value.length = len;
md->val[md->len - 1].padata_value.data = buf; md->val[md->len - 1].padata_value.data = buf;
return 0; return 0;
@@ -516,7 +516,7 @@ as_rep(KDC_REQ *req,
PA_DATA *pa; PA_DATA *pa;
int found_pa = 0; int found_pa = 0;
kdc_log(5, "Looking for pa-data -- %s", client_name); kdc_log(5, "Looking for pa-data -- %s", client_name);
while((pa = find_padata(req, &i, pa_enc_timestamp))){ while((pa = find_padata(req, &i, KRB5_PADATA_ENC_TIMESTAMP))){
krb5_data ts_data; krb5_data ts_data;
PA_ENC_TS_ENC p; PA_ENC_TS_ENC p;
time_t patime; time_t patime;
@@ -619,7 +619,7 @@ as_rep(KDC_REQ *req,
ret = realloc_method_data(&method_data); ret = realloc_method_data(&method_data);
pa = &method_data.val[method_data.len-1]; pa = &method_data.val[method_data.len-1];
pa->padata_type = pa_enc_timestamp; pa->padata_type = KRB5_PADATA_ENC_TIMESTAMP;
pa->padata_value.length = 0; pa->padata_value.length = 0;
pa->padata_value.data = NULL; pa->padata_value.data = NULL;
@@ -1659,7 +1659,7 @@ tgs_rep(KDC_REQ *req,
goto out; goto out;
} }
tgs_req = find_padata(req, &i, pa_tgs_req); tgs_req = find_padata(req, &i, KRB5_PADATA_TGS_REQ);
if(tgs_req == NULL){ if(tgs_req == NULL){
ret = KRB5KDC_ERR_PADATA_TYPE_NOSUPP; ret = KRB5KDC_ERR_PADATA_TYPE_NOSUPP;

2
lib/kadm5/get_s.c
View File

@@ -150,7 +150,7 @@ kadm5_s_get_principal(void *server_handle,
if(key->salt) if(key->salt)
kd->key_data_type[1] = key->salt->type; kd->key_data_type[1] = key->salt->type;
else else
kd->key_data_type[1] = pa_pw_salt; kd->key_data_type[1] = KRB5_PADATA_PW_SALT;
/* setup key */ /* setup key */
kd->key_data_length[0] = key->key.keyvalue.length; kd->key_data_length[0] = key->key.keyvalue.length;
kd->key_data_contents[0] = malloc(kd->key_data_length[0]); kd->key_data_contents[0] = malloc(kd->key_data_length[0]);