From: Theodore Tso <tytso@mit.edu>
Date: Tue, 29 Sep 1992 13:45:39 +0000 (+0000)
Subject: Changes to support new calling sequence for get_in_tkt (preauthentication
X-Git-Tag: krb5-1.0-beta2~46
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=230838596b3ea4da7ade51fefd6cb8b2a3491d4f;p=krb5.git

Changes to support new calling sequence for get_in_tkt (preauthentication
and KDC reply changes)

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

diff --git a/src/lib/krb5/krb/in_tkt_pwd.c b/src/lib/krb5/krb/in_tkt_pwd.c
index 38e32ed76..03e3d9d0d 100644
--- a/src/lib/krb5/krb/in_tkt_pwd.c
+++ b/src/lib/krb5/krb/in_tkt_pwd.c
@@ -142,18 +142,22 @@ OLDDECLARG(krb5_pa_data **,padata)
 krb5_error_code
 krb5_get_in_tkt_with_password(DECLARG(const krb5_flags, options),
 			      DECLARG(krb5_address * const *, addrs),
+			      DECLARG(const krb5_preauthtype, pre_auth_type),
 			      DECLARG(const krb5_enctype, etype),
 			      DECLARG(const krb5_keytype, keytype),
 			      DECLARG(const char *, password),
 			      DECLARG(krb5_ccache, ccache),
-			      DECLARG(krb5_creds *, creds))
+			      DECLARG(krb5_creds *, creds), 
+			      DECLARG(krb5_kdc_rep **, ret_as_reply))
 OLDDECLARG(const krb5_flags, options)
 OLDDECLARG(krb5_address * const *, addrs)
+OLDDECLARG(const krb5_preauthtype, pre_auth_type)
 OLDDECLARG(const krb5_enctype, etype)
 OLDDECLARG(const krb5_keytype, keytype)
 OLDDECLARG(const char *, password)
 OLDDECLARG(krb5_ccache, ccache)
 OLDDECLARG(krb5_creds *, creds)
+OLDDECLARG(krb5_kdc_rep **, ret_as_reply)
 {
     krb5_error_code retval;
     struct pwd_keyproc_arg keyseed;
@@ -166,10 +170,10 @@ OLDDECLARG(krb5_creds *, creds)
 	keyseed.password.length = 0;
     keyseed.who = creds->client;
 
-    retval = krb5_get_in_tkt(options, addrs, etype, keytype, pwd_keyproc,
-			     (krb5_pointer) &keyseed,
+    retval = krb5_get_in_tkt(options, addrs, pre_auth_type, etype,
+			     keytype, pwd_keyproc, (krb5_pointer) &keyseed,
 			     krb5_kdc_rep_decrypt_proc, 0,
-			     creds, ccache);
+			     creds, ccache, ret_as_reply);
     return retval;
 }
 
diff --git a/src/lib/krb5/krb/in_tkt_sky.c b/src/lib/krb5/krb/in_tkt_sky.c
index cfd4cde02..573235d9e 100644
--- a/src/lib/krb5/krb/in_tkt_sky.c
+++ b/src/lib/krb5/krb/in_tkt_sky.c
@@ -124,16 +124,21 @@ OLDDECLARG(krb5_pa_data **,padata)
 krb5_error_code
 krb5_get_in_tkt_with_skey(DECLARG(const krb5_flags, options),
 			  DECLARG(krb5_address * const *, addrs),
+			  DECLARG(const krb5_preauthtype, pre_auth_type),
 			  DECLARG(const krb5_enctype, etype),
 			  DECLARG(const krb5_keyblock *,key),
 			  DECLARG(krb5_ccache, ccache),
-			  DECLARG(krb5_creds *,creds))
+			  DECLARG(krb5_creds *,creds),
+			  DECLARG(krb5_kdc_rep **, ret_as_reply))
 OLDDECLARG(const krb5_flags, options)
 OLDDECLARG(krb5_address * const *, addrs)
+OLDDECLARG(const krb5_preauthtype, pre_auth_type)
 OLDDECLARG(const krb5_enctype, etype)
 OLDDECLARG(const krb5_keyblock *,key)
 OLDDECLARG(krb5_ccache, ccache)
 OLDDECLARG(krb5_creds *, creds)
+OLDDECLARG(krb5_kdc_rep **, ret_as_reply)
+
 {
     struct skey_keyproc_arg arg;
     krb5_keytype keytype;
@@ -150,10 +155,8 @@ OLDDECLARG(krb5_creds *, creds)
 
 	keytype = krb5_csarray[etype]->system->proto_keytype;
     }
-    return (krb5_get_in_tkt(options, addrs, etype, keytype, skey_keyproc,
-			    (krb5_pointer) &arg,
-			    krb5_kdc_rep_decrypt_proc,
-			    0,
-			    creds,
-			    ccache));
+    return (krb5_get_in_tkt(options, addrs, pre_auth_type, etype, keytype,
+			    skey_keyproc, (krb5_pointer) &arg,
+			    krb5_kdc_rep_decrypt_proc, 0, creds,
+			    ccache, ret_as_reply));
 }