From 328af4c3188391f994ef334c460312904b882a69 Mon Sep 17 00:00:00 2001
From: Johan Danielsson <joda@pdc.kth.se>
Date: Mon, 19 Jun 2000 16:11:31 +0000
Subject: [PATCH] pa_* -> KRB5_PADATA_*

git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@8409 ec53bebd-3082-4978-b11e-865c3cabbd6b
---
 kdc/kerberos5.c   | 10 +++++-----
 lib/kadm5/get_s.c |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/kdc/kerberos5.c b/kdc/kerberos5.c
index 2560807f4..ad8b3417f 100644
--- a/kdc/kerberos5.c
+++ b/kdc/kerberos5.c
@@ -310,7 +310,7 @@ get_pa_etype_info(METHOD_DATA *md, hdb_entry *client)
 #if 0
 	    *pa.val[i].salttype = 1; /* or 0 with salt? */
 #else
-	    *pa.val[i].salttype = pa_pw_salt;
+	    *pa.val[i].salttype = KRB5_PADATA_PW_SALT;
 #endif
 	    pa.val[i].salt = NULL;
 	}
@@ -332,7 +332,7 @@ get_pa_etype_info(METHOD_DATA *md, hdb_entry *client)
 	free(buf);
 	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.data = buf;
     return 0;
@@ -516,7 +516,7 @@ as_rep(KDC_REQ *req,
 	PA_DATA *pa;
 	int found_pa = 0;
 	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;
 	    PA_ENC_TS_ENC p;
 	    time_t patime;
@@ -619,7 +619,7 @@ as_rep(KDC_REQ *req,
 
 	ret = realloc_method_data(&method_data);
 	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.data	= NULL;
 
@@ -1659,7 +1659,7 @@ tgs_rep(KDC_REQ *req,
 	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){
 	ret = KRB5KDC_ERR_PADATA_TYPE_NOSUPP;
diff --git a/lib/kadm5/get_s.c b/lib/kadm5/get_s.c
index 60d29bf1a..1d717b88c 100644
--- a/lib/kadm5/get_s.c
+++ b/lib/kadm5/get_s.c
@@ -150,7 +150,7 @@ kadm5_s_get_principal(void *server_handle,
 	    if(key->salt)
 		kd->key_data_type[1] = key->salt->type;
 	    else
-		kd->key_data_type[1] = pa_pw_salt;
+		kd->key_data_type[1] = KRB5_PADATA_PW_SALT;
 	    /* setup key */
 	    kd->key_data_length[0] = key->key.keyvalue.length;
 	    kd->key_data_contents[0] = malloc(kd->key_data_length[0]);