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 2c709e4a4bf4979d55582cd93c5f13eb75f82a89..eeaf28de77464ad4221352ae163ba1e6e2575f52 100644 (file)
--- 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 c4a070ede1dd7fe3fe08cd476b1bcb49120e6789..02d78f0a4f69c060e40be02709c3b47e02c209e7 100644 (file)
--- 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,