svn commit: samba r19940 - in branches/SAMBA_3_0_24/source/libsmb: .

[jerry at samba.org]

Author: jerry
Date: 2006-11-28 21:11:56 +0000 (Tue, 28 Nov 2006)
New Revision: 19940

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

Log:
copy clikrb5.c from SAMBA_3_0 tree to get compile warning fixes
Modified:
   branches/SAMBA_3_0_24/source/libsmb/clikrb5.c


Changeset:
Modified: branches/SAMBA_3_0_24/source/libsmb/clikrb5.c
===================================================================
--- branches/SAMBA_3_0_24/source/libsmb/clikrb5.c	2006-11-28 21:11:20 UTC (rev 19939)
+++ branches/SAMBA_3_0_24/source/libsmb/clikrb5.c	2006-11-28 21:11:56 UTC (rev 19940)
@@ -852,6 +852,29 @@
 #endif
 }
 
+#ifdef HAVE_KRB5_DECODE_AP_REQ	/* Heimdal */
+static int get_kvno_from_ap_req(krb5_ap_req *ap_req)
+{
+#ifdef HAVE_TICKET_POINTER_IN_KRB5_AP_REQ /* MIT */
+	if (ap_req->ticket->enc_part.kvno)
+		return ap_req->ticket->enc_part.kvno;
+#else /* Heimdal */
+	if (ap_req->ticket.enc_part.kvno) 
+		return *ap_req->ticket.enc_part.kvno;
+#endif
+	return 0;
+}
+
+static krb5_enctype get_enctype_from_ap_req(krb5_ap_req *ap_req)
+{
+#ifdef HAVE_ETYPE_IN_ENCRYPTEDDATA /* Heimdal */
+	return ap_req->ticket.enc_part.etype;
+#else /* MIT */
+	return ap_req->ticket->enc_part.enctype;
+#endif
+}
+#endif	/* HAVE_KRB5_DECODE_AP_REQ */
+
 static krb5_error_code
 get_key_from_keytab(krb5_context context,
 		    krb5_const_principal server,