* kpasswd.c Removed krb5_keytype, changed krb5_enctype to

		krb5_enctype *, changed krb5_preauthtype to krb5_preauthtype *
		for krb5_get_in_tkt_with_password() rotuine.

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

diff --git a/src/kadmin/kpasswd/ChangeLog b/src/kadmin/kpasswd/ChangeLog
index 9754a4b1e9f2c21261d29727f6c549a62dbf5f26..d59e7c6e19c959731037179f2da61ad2cae2eceb 100644 (file)
--- a/src/kadmin/kpasswd/ChangeLog
+++ b/src/kadmin/kpasswd/ChangeLog
@@ -1,3 +1,9 @@
+Mon Feb 06 17:19:04 1995 Chris Provenzano  (proven@mit.edu)
+
+        * kpasswd.c Removed krb5_keytype, changed krb5_enctype to 
+               krb5_enctype *, changed krb5_preauthtype to krb5_preauthtype *
+               for krb5_get_in_tkt_with_password() rotuine.
+
 Wed Jan 25 16:54:40 1995  Chris Provenzano (proven@mit.edu)
 
         * Removed all narrow types and references to wide.h and narrow.h

diff --git a/src/kadmin/kpasswd/kpasswd.c b/src/kadmin/kpasswd/kpasswd.c
index 93fe82d8d2176b5c6c102bc7cd3f110f621fbea4..edca72c2b261065ff221910961bcca852e73081f 100644 (file)
--- a/src/kadmin/kpasswd/kpasswd.c
+++ b/src/kadmin/kpasswd/kpasswd.c
@@ -78,15 +78,6 @@ krb5_creds my_creds;
 
 extern char *krb5_default_pwd_prompt1;
 
-/*
- * Try no preauthentication first; then try the encrypted timestamp
- */
-int preauth_search_list[] = {
-       0,                      
-       KRB5_PADATA_ENC_TIMESTAMP,
-       -1
-       };
-
 main(argc,argv)
   int argc;
   char *argv[];
@@ -638,23 +629,11 @@ get_first_ticket(context, cache, client)
        return(1);
     }
 
-/*     Build Request for Initial Credentials */
-    for (i=0; preauth_search_list[i] >= 0; i++) {
-       retval = krb5_get_in_tkt_with_password(context, 
-                                       0,      /* options */
-                                       my_addresses,
-                                       /* do random preauth */
-                                        preauth_search_list[i],
-                                       ETYPE_DES_CBC_CRC,   /* etype */
-                                       KEYTYPE_DES,
-                                       old_password,
-                                       cache,
-                                       &my_creds,
-                                       0);
-       if (retval != KRB5KDC_ERR_PREAUTH_FAILED &&
-           retval != KRB5KRB_ERR_GENERIC)
-           break;
-    }
+    retval = krb5_get_in_tkt_with_password(context, 0,/* options */
+                                       my_addresses, 
+                                       NULL, /* Default encryption list */
+                                        NULL, /* Default preauth list */
+                                       old_password, cache, &my_creds, 0);
        
     if (retval) {
        fprintf(stderr, "\nUnable to Get Initial Credentials : %s %d\n",