svn commit: lorikeet r500 - in trunk/heimdal/lib/gssapi: .

[abartlet at samba.org]

Author: abartlet
Date: 2005-11-29 11:07:21 +0000 (Tue, 29 Nov 2005)
New Revision: 500

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

Log:
Fix the other half of the merge error.

Andrew Bartlett

Modified:
   trunk/heimdal/lib/gssapi/gssapi.h


Changeset:
Modified: trunk/heimdal/lib/gssapi/gssapi.h
===================================================================
--- trunk/heimdal/lib/gssapi/gssapi.h	2005-11-29 09:23:26 UTC (rev 499)
+++ trunk/heimdal/lib/gssapi/gssapi.h	2005-11-29 11:07:21 UTC (rev 500)
@@ -794,7 +794,7 @@
 	 struct EncryptionKey **out);
 
 OM_uint32 gss_krb5_import_cred(OM_uint32 *minor_status,
-			       struct krb5_ccache_desc * /* id */,
+			       struct krb5_ccache_data * /* id */,
 			       struct Principal * /* keytab_principal */,
 			       struct krb5_keytab_data * /* keytab */,
 			       gss_cred_id_t */* cred */);