Index: lib/krb5/digest.c
===================================================================
--- lib/krb5/digest.c	(revision 21928)
+++ lib/krb5/digest.c	(revision 21929)
@@ -35,7 +35,7 @@
 RCSID("$Id$");
 #include "digest_asn1.h"
 
-struct krb5_digest {
+struct krb5_digest_data {
     char *cbtype;
     char *cbbinding;
 
@@ -812,7 +812,7 @@
     return ret;
 }
 
-struct krb5_ntlm {
+struct krb5_ntlm_data {
     NTLMInit init;
     NTLMInitReply initReply;
     NTLMRequest request;
Index: lib/krb5/krb5.h
===================================================================
--- lib/krb5/krb5.h	(revision 21928)
+++ lib/krb5/krb5.h	(revision 21929)
@@ -75,10 +75,10 @@
 struct krb5_get_creds_opt_data;
 typedef struct krb5_get_creds_opt_data *krb5_get_creds_opt;
 
-struct krb5_digest;
-typedef struct krb5_digest *krb5_digest;
-struct krb5_ntlm;
-typedef struct krb5_ntlm *krb5_ntlm;
+struct krb5_digest_data;
+typedef struct krb5_digest_data *krb5_digest;
+struct krb5_ntlm_data;
+typedef struct krb5_ntlm_data *krb5_ntlm;
 
 typedef struct krb5_pac *krb5_pac;
 
Index: lib/krb5/rd_req.c
===================================================================
--- lib/krb5/rd_req.c	(revision 21933)
+++ lib/krb5/rd_req.c	(revision 21934)
@@ -512,13 +512,13 @@
  *
  */
 
-struct krb5_rd_req_in_ctx {
+struct krb5_rd_req_in_ctx_data {
     krb5_keytab keytab;
     krb5_keyblock *keyblock;
     krb5_boolean no_pac_check;
 };
 
-struct krb5_rd_req_out_ctx {
+struct krb5_rd_req_out_ctx_data {
     krb5_keyblock *keyblock;
     krb5_flags ap_req_options;
     krb5_ticket *ticket;
@@ -826,14 +826,15 @@
 	    goto out;
     }
 
-    ret = krb5_verify_ap_req(context,
-			     auth_context,
-			     &ap_req,
-			     server,
-			     o->keyblock,
-			     0,
-			     &o->ap_req_options,
-			     &o->ticket);
+    ret = krb5_verify_ap_req2(context,
+			      auth_context,
+			      &ap_req,
+			      server,
+			      o->keyblock,
+			      0,
+			      &o->ap_req_options,
+			      &o->ticket,
+			      KRB5_KU_AP_REQ_AUTH);
 
     if (ret)
 	goto out;
Index: lib/krb5/send_to_kdc.c
===================================================================
--- lib/krb5/send_to_kdc.c	(revision 21933)
+++ lib/krb5/send_to_kdc.c	(revision 21934)
@@ -448,7 +448,7 @@
     return 0;
 }
 
-struct krb5_sendto_ctx {
+struct krb5_sendto_ctx_data {
     int flags;
     int type;
     krb5_sendto_ctx_func func;
Index: lib/krb5/test_pac.c
===================================================================
--- lib/krb5/test_pac.c	(revision 21933)
+++ lib/krb5/test_pac.c	(revision 21934)
@@ -102,7 +102,7 @@
 {
     krb5_error_code ret;
     krb5_context context;
-    struct krb5_pac *pac;
+    krb5_pac pac;
     krb5_data data;
     krb5_principal p;
 
@@ -144,7 +144,7 @@
     {
 	uint32_t *list;
 	size_t len, i;
-	struct krb5_pac *pac2;
+	krb5_pac pac2;
 
 	ret = krb5_pac_init(context, &pac2);
 	if (ret)
Index: lib/krb5/pac.c
===================================================================
--- lib/krb5/pac.c	(revision 21933)
+++ lib/krb5/pac.c	(revision 21934)
@@ -48,7 +48,7 @@
     struct PAC_INFO_BUFFER buffers[1];
 };
 
-struct krb5_pac {
+struct krb5_pac_data {
     struct PACTYPE *pac;
     krb5_data data;
     struct PAC_INFO_BUFFER *server_checksum;
@@ -82,10 +82,10 @@
 
 krb5_error_code
 krb5_pac_parse(krb5_context context, const void *ptr, size_t len,
-	       struct krb5_pac **pac)
+	       krb5_pac *pac)
 {
     krb5_error_code ret;
-    struct krb5_pac *p;
+    krb5_pac p;
     krb5_storage *sp = NULL;
     uint32_t i, tmp, tmp2, header_end;
 
@@ -216,10 +216,10 @@
 }
 
 krb5_error_code
-krb5_pac_init(krb5_context context, struct krb5_pac **pac)
+krb5_pac_init(krb5_context context, krb5_pac *pac)
 {
     krb5_error_code ret;
-    struct krb5_pac *p;
+    krb5_pac p;
 
     p = calloc(1, sizeof(*p));
     if (p == NULL) {
@@ -248,7 +248,7 @@
 }
 
 krb5_error_code
-krb5_pac_add_buffer(krb5_context context, struct krb5_pac *p,
+krb5_pac_add_buffer(krb5_context context, krb5_pac p,
 		    uint32_t type, const krb5_data *data)
 {
     krb5_error_code ret;
@@ -316,7 +316,7 @@
 }
 
 krb5_error_code
-krb5_pac_get_buffer(krb5_context context, struct krb5_pac *p,
+krb5_pac_get_buffer(krb5_context context, krb5_pac p,
 		    uint32_t type, krb5_data *data)
 {
     krb5_error_code ret;
@@ -361,7 +361,7 @@
 
 krb5_error_code
 krb5_pac_get_types(krb5_context context,
-		   struct krb5_pac *p,
+		   krb5_pac p,
 		   size_t *len,
 		   uint32_t **types)
 {
@@ -385,7 +385,7 @@
  */
 
 void
-krb5_pac_free(krb5_context context, struct krb5_pac *pac)
+krb5_pac_free(krb5_context context, krb5_pac pac)
 {
     krb5_data_free(&pac->data);
     free(pac->pac);
@@ -703,7 +703,7 @@
 
 krb5_error_code
 krb5_pac_verify(krb5_context context, 
-		const struct krb5_pac *pac,
+		const krb5_pac pac,
 		time_t authtime,
 		krb5_const_principal principal,
 		const krb5_keyblock *server,
@@ -840,7 +840,7 @@
 
 krb5_error_code
 _krb5_pac_sign(krb5_context context,
-	       struct krb5_pac *p,
+	       krb5_pac p,
 	       time_t authtime,
 	       krb5_principal principal,
 	       const krb5_keyblock *server_key,
Index: lib/krb5/krb5.h
===================================================================
--- lib/krb5/krb5.h	(revision 21933)
+++ lib/krb5/krb5.h	(revision 21934)
@@ -80,10 +80,11 @@
 struct krb5_ntlm_data;
 typedef struct krb5_ntlm_data *krb5_ntlm;
 
-typedef struct krb5_pac *krb5_pac;
+struct krb5_pac_data;
+typedef struct krb5_pac_data *krb5_pac;
 
-typedef struct krb5_rd_req_in_ctx *krb5_rd_req_in_ctx;
-typedef struct krb5_rd_req_out_ctx *krb5_rd_req_out_ctx;
+typedef struct krb5_rd_req_in_ctx_data *krb5_rd_req_in_ctx;
+typedef struct krb5_rd_req_out_ctx_data *krb5_rd_req_out_ctx;
 
 typedef CKSUMTYPE krb5_cksumtype;
 
@@ -753,7 +754,7 @@
     KRB5_PRINCIPAL_UNPARSE_DISPLAY = 4
 };
 
-typedef struct krb5_sendto_ctx *krb5_sendto_ctx;
+typedef struct krb5_sendto_ctx_data *krb5_sendto_ctx;
 
 #define KRB5_SENDTO_DONE	0
 #define KRB5_SENDTO_RESTART	1