svn commit: lorikeet r801 - in trunk/heimdal: . lib/krb5

[abartlet at samba.org]

Author: abartlet
Date: 2008-07-28 09:31:00 +0000 (Mon, 28 Jul 2008)
New Revision: 801

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=lorikeet&rev=801

Log:
Revert back to using the extra argument on send_to_kdc, until Samba
moves to the plugin version of this function.

Andrew Bartlett

Modified:
   trunk/heimdal/heimdal-lorikeet.diff
   trunk/heimdal/lib/krb5/krb5.h
   trunk/heimdal/lib/krb5/send_to_kdc.c


Changeset:
Modified: trunk/heimdal/heimdal-lorikeet.diff
===================================================================
--- trunk/heimdal/heimdal-lorikeet.diff	2008-07-28 06:24:17 UTC (rev 800)
+++ trunk/heimdal/heimdal-lorikeet.diff	2008-07-28 09:31:00 UTC (rev 801)
@@ -180,3 +180,28 @@
      ret = _krb5_principalname2krb5_principal (context,
  					      &tmp_principal,
  					      rep->kdc_rep.cname,
+Index: lib/krb5/send_to_kdc.c
+===================================================================
+--- lib/krb5/send_to_kdc.c	(revision 800)
++++ lib/krb5/send_to_kdc.c	(working copy)
+@@ -385,7 +385,7 @@
+ 		 struct send_to_kdc *s = context->send_to_kdc;
+ 
+ 		 ret = (*s->func)(context, s->data, 
+-				  hi, send_data, receive);
++				  hi, context->kdc_timeout, send_data, receive);
+ 		 if (ret == 0 && receive->length != 0)
+ 		     goto out;
+ 		 continue;
+Index: lib/krb5/krb5.h
+===================================================================
+--- lib/krb5/krb5.h	(revision 800)
++++ lib/krb5/krb5.h	(working copy)
+@@ -725,6 +725,7 @@
+ typedef krb5_error_code (*krb5_send_to_kdc_func)(krb5_context, 
+ 						 void *, 
+ 						 krb5_krbhst_info *,
++						 time_t timeout,
+ 						 const krb5_data *,
+ 						 krb5_data *);
+ 

Modified: trunk/heimdal/lib/krb5/krb5.h
===================================================================
--- trunk/heimdal/lib/krb5/krb5.h	2008-07-28 06:24:17 UTC (rev 800)
+++ trunk/heimdal/lib/krb5/krb5.h	2008-07-28 09:31:00 UTC (rev 801)
@@ -725,6 +725,7 @@
 typedef krb5_error_code (*krb5_send_to_kdc_func)(krb5_context, 
 						 void *, 
 						 krb5_krbhst_info *,
+						 time_t timeout,
 						 const krb5_data *,
 						 krb5_data *);
 

Modified: trunk/heimdal/lib/krb5/send_to_kdc.c
===================================================================
--- trunk/heimdal/lib/krb5/send_to_kdc.c	2008-07-28 06:24:17 UTC (rev 800)
+++ trunk/heimdal/lib/krb5/send_to_kdc.c	2008-07-28 09:31:00 UTC (rev 801)
@@ -385,7 +385,7 @@
 		 struct send_to_kdc *s = context->send_to_kdc;
 
 		 ret = (*s->func)(context, s->data, 
-				  hi, send_data, receive);
+				  hi, context->kdc_timeout, send_data, receive);
 		 if (ret == 0 && receive->length != 0)
 		     goto out;
 		 continue;