From: Theodore Tso <tytso@mit.edu>
Date: Wed, 30 Sep 1992 14:33:37 +0000 (+0000)
Subject: KRB5_PADATA_ENC_RANDOM --> KRB5_PADATA_ENC_TIMESTAMP
X-Git-Tag: krb5-1.0-beta2~2
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=3095354c89323cc380495b7ce19862bf948cd557;p=krb5.git

KRB5_PADATA_ENC_RANDOM --> KRB5_PADATA_ENC_TIMESTAMP

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@2460 dc483132-0cff-0310-8789-dd5450dbe970
---

diff --git a/src/include/krb5/proto.h b/src/include/krb5/proto.h
index 2c709e4a4..eeaf28de7 100644
--- a/src/include/krb5/proto.h
+++ b/src/include/krb5/proto.h
@@ -64,8 +64,10 @@
 #define	KRB5_PADATA_TGS_REQ		KRB5_PADATA_AP_REQ
 #define KRB5_PADATA_ENC_TIMESTAMPS	2
 #define	KRB5_PADATA_PW_SALT		3
+#if 0				/* Not used */
 #define KRB5_PADATA_ENC_ENCKEY          4  /* Key encrypted within itself */
-#define KRB5_PADATA_ENC_RANDOM          5  /* random data */
+#endif
+#define KRB5_PADATA_ENC_TIMESTAMP       5  /* timestamp encrypted in key */
 #define KRB5_PADATA_ENC_SECURID         6  /* SecurId passcode */
 
 /* Reserved for SPX pre-authentication. */
diff --git a/src/kadmin/kpasswd/kpasswd.c b/src/kadmin/kpasswd/kpasswd.c
index c4a070ede..02d78f0a4 100644
--- a/src/kadmin/kpasswd/kpasswd.c
+++ b/src/kadmin/kpasswd/kpasswd.c
@@ -718,7 +718,7 @@ OLDDECLARG(krb5_principal, client)
 					0,	/* options */
 					my_addresses,
 					/* do random preauth */
-                                        KRB5_PADATA_ENC_RANDOM,
+                                        KRB5_PADATA_ENC_TIMESTAMP,
 					ETYPE_DES_CBC_CRC,   /* etype */
 					KEYTYPE_DES,
 					old_password,
@@ -741,7 +741,7 @@ OLDDECLARG(krb5_principal, client)
         if ((retval = krb5_get_in_tkt(
 			0,      /* options */
 			my_addresses,
-                        KRB5_PADATA_ENC_RANDOM,	/* do random preauth */
+                        KRB5_PADATA_ENC_TIMESTAMP,	/* do preauth */
 			ETYPE_DES_CBC_CRC,
 			KEYTYPE_DES,
 			v4_pwd_keyproc,