* krb_auth_su.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@4918 dc483132-0cff-0310-8789-dd5450dbe970

diff --git a/src/clients/ksu/ChangeLog b/src/clients/ksu/ChangeLog
index 9e91d4c5689603ecc36396dce033a60dc5676d78..93ccbd533157056ab7dbc13535d879eae845e79f 100644 (file)
--- a/src/clients/ksu/ChangeLog
+++ b/src/clients/ksu/ChangeLog
@@ -1,3 +1,9 @@
+Mon Feb 06 17:19:04 1995 Chris Provenzano  (proven@mit.edu)
+
+        * krb_auth_su.c Removed krb5_keytype, changed krb5_enctype to
+                krb5_enctype *, changed krb5_preauthtype to krb5_preauthtype *
+                for krb5_get_in_tkt_with_password() rotuine.
+
 Sat Jan 28 14:45:55 1995  Chris Provenzano (proven@mit.edu)
 
         * krb_auth_su.c (krb5_verify_tkt_def()) use new API for 

diff --git a/src/clients/ksu/krb_auth_su.c b/src/clients/ksu/krb_auth_su.c
index 20f4da6f4cd879da7e308df7732cf57f06cfcc89..9e7e153daf967134f3b6a23625a5230f032fa580 100644 (file)
--- a/src/clients/ksu/krb_auth_su.c
+++ b/src/clients/ksu/krb_auth_su.c
@@ -46,11 +46,8 @@ krb5_data tgtname = {
 /*
  * Try no preauthentication first; then try the encrypted timestamp
  */
-int preauth_search_list[] = {
-       0,                      
-       KRB5_PADATA_ENC_TIMESTAMP,
-       -1
-       };
+krb5_preauthtype preauth_list[2] = { 0, -1 };
+krb5_preauthtype * preauth_ptr = NULL;
 
 
 
@@ -384,7 +381,6 @@ krb5_boolean krb5_get_tkt_via_passwd (context, ccache, client, server,
     krb5_error_code code;
     krb5_creds my_creds;
     krb5_timestamp now;
-    int preauth_type = -1;
     int pwsize;
     int        i;
     char password[255], *client_name, prompt[255];
@@ -452,29 +448,9 @@ krb5_boolean krb5_get_tkt_via_passwd (context, ccache, client, server,
              return (FALSE); 
         }
 
-        if (preauth_type > 0) {
-            code = krb5_get_in_tkt_with_password(context, options->opt, 
-                                                 my_addresses, preauth_type,
-                                                 ETYPE_DES_CBC_CRC,
-                                                 KEYTYPE_DES,
-                                                 password,
-                                                 *ccache,
-                                                 &my_creds, 0);
-        } else {
-            for (i=0; preauth_search_list[i] >= 0; i++) {
-                code = krb5_get_in_tkt_with_password(context, options->opt, 
-                                                     my_addresses,
-                                                     preauth_search_list[i],
-                                                     ETYPE_DES_CBC_CRC,
-                                                     KEYTYPE_DES,
-                                                     password,
-                                                     *ccache,
-                                                     &my_creds, 0);
-            if (code != KRB5KDC_ERR_PREAUTH_FAILED &&
-                code != KRB5KRB_ERR_GENERIC)
-                break;
-            }
-        }
+        code = krb5_get_in_tkt_with_password(context, options->opt, 
+                                             my_addresses, NULL, preauth_ptr,
+                                             password, *ccache, &my_creds, 0);
         memset(password, 0, sizeof(password));