s4-krb5: Fix typos in comment.
[sfrench/samba-autobuild/.git] / source4 / heimdal / lib / krb5 / rd_req.c
index c424a73a34d621dbc2c36a028e343751de582304..6b2ffbdaac48ac132a6d851954f41733d1c5fbdc 100644 (file)
@@ -1,39 +1,38 @@
+
 /*
- * Copyright (c) 1997 - 2001, 2003 - 2005 Kungliga Tekniska Högskolan
- * (Royal Institute of Technology, Stockholm, Sweden). 
- * All rights reserved. 
+ * Copyright (c) 1997 - 2007 Kungliga Tekniska Högskolan
+ * (Royal Institute of Technology, Stockholm, Sweden).
+ * All rights reserved.
  *
- * Redistribution and use in source and binary forms, with or without 
- * modification, are permitted provided that the following conditions 
- * are met: 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
  *
- * 1. Redistributions of source code must retain the above copyright 
- *    notice, this list of conditions and the following disclaimer. 
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
  *
- * 2. Redistributions in binary form must reproduce the above copyright 
- *    notice, this list of conditions and the following disclaimer in the 
- *    documentation and/or other materials provided with the distribution. 
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
  *
- * 3. Neither the name of the Institute nor the names of its contributors 
- *    may be used to endorse or promote products derived from this software 
- *    without specific prior written permission. 
+ * 3. Neither the name of the Institute nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
  *
- * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND 
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE 
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL 
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS 
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 
- * SUCH DAMAGE. 
+ * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
  */
 
-#include <krb5_locl.h>
-
-RCSID("$Id: rd_req.c,v 1.66 2006/10/06 17:04:29 lha Exp $");
+#include "krb5_locl.h"
 
 static krb5_error_code
 decrypt_tkt_enc_part (krb5_context context,
@@ -58,8 +57,11 @@ decrypt_tkt_enc_part (krb5_context context,
     if (ret)
        return ret;
 
-    ret = krb5_decode_EncTicketPart(context, plain.data, plain.length, 
-                                   decr_part, &len);
+    ret = decode_EncTicketPart(plain.data, plain.length, decr_part, &len);
+    if (ret)
+        krb5_set_error_message(context, ret, 
+                              N_("Failed to decode encrypted "
+                                 "ticket part", ""));
     krb5_data_free (&plain);
     return ret;
 }
@@ -95,13 +97,13 @@ decrypt_authenticator (krb5_context context,
     if (ret)
        return ret;
 
-    ret = krb5_decode_Authenticator(context, plain.data, plain.length, 
-                                   authenticator, &len);
+    ret = decode_Authenticator(plain.data, plain.length,
+                              authenticator, &len);
     krb5_data_free (&plain);
     return ret;
 }
 
-krb5_error_code KRB5_LIB_FUNCTION
+KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
 krb5_decode_ap_req(krb5_context context,
                   const krb5_data *inbuf,
                   krb5_ap_req *ap_req)
@@ -113,17 +115,17 @@ krb5_decode_ap_req(krb5_context context,
        return ret;
     if (ap_req->pvno != 5){
        free_AP_REQ(ap_req);
-       krb5_clear_error_string (context);
+       krb5_clear_error_message (context);
        return KRB5KRB_AP_ERR_BADVERSION;
     }
     if (ap_req->msg_type != krb_ap_req){
        free_AP_REQ(ap_req);
-       krb5_clear_error_string (context);
+       krb5_clear_error_message (context);
        return KRB5KRB_AP_ERR_MSG_TYPE;
     }
     if (ap_req->ticket.tkt_vno != 5){
        free_AP_REQ(ap_req);
-       krb5_clear_error_string (context);
+       krb5_clear_error_message (context);
        return KRB5KRB_AP_ERR_BADVERSION;
     }
     return 0;
@@ -133,11 +135,11 @@ static krb5_error_code
 check_transited(krb5_context context, Ticket *ticket, EncTicketPart *enc)
 {
     char **realms;
-    int num_realms;
+    unsigned int num_realms;
     krb5_error_code ret;
-           
-    /* 
-     * Windows 2000 and 2003 uses this inside their TGT so its normaly
+       
+    /*
+     * Windows 2000 and 2003 uses this inside their TGT so it's normaly
      * not seen by others, however, samba4 joined with a Windows AD as
      * a Domain Controller gets exposed to this.
      */
@@ -150,14 +152,14 @@ check_transited(krb5_context context, Ticket *ticket, EncTicketPart *enc)
     if(enc->transited.contents.length == 0)
        return 0;
 
-    ret = krb5_domain_x500_decode(context, enc->transited.contents, 
-                                 &realms, &num_realms, 
+    ret = krb5_domain_x500_decode(context, enc->transited.contents,
+                                 &realms, &num_realms,
                                  enc->crealm,
                                  ticket->realm);
     if(ret)
        return ret;
-    ret = krb5_check_transited(context, enc->crealm, 
-                              ticket->realm, 
+    ret = krb5_check_transited(context, enc->crealm,
+                              ticket->realm,
                               realms, num_realms, NULL);
     free(realms);
     return ret;
@@ -208,13 +210,15 @@ find_etypelist(krb5_context context,
                           adIfRelevant.val[0].ad_data.length,
                           etypes,
                           NULL);
+    if (ret)
+       krb5_clear_error_message(context);
 
     free_AD_IF_RELEVANT(&adIfRelevant);
 
     return ret;
 }
 
-krb5_error_code KRB5_LIB_FUNCTION
+KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
 krb5_decrypt_ticket(krb5_context context,
                    Ticket *ticket,
                    krb5_keyblock *key,
@@ -226,7 +230,7 @@ krb5_decrypt_ticket(krb5_context context,
     ret = decrypt_tkt_enc_part (context, key, &ticket->enc_part, &t);
     if (ret)
        return ret;
-    
+
     {
        krb5_timestamp now;
        time_t start = t.authtime;
@@ -238,12 +242,12 @@ krb5_decrypt_ticket(krb5_context context,
           || (t.flags.invalid
               && !(flags & KRB5_VERIFY_AP_REQ_IGNORE_INVALID))) {
            free_EncTicketPart(&t);
-           krb5_clear_error_string (context);
+           krb5_clear_error_message (context);
            return KRB5KRB_AP_ERR_TKT_NYV;
        }
        if(now - t.endtime > context->max_skew) {
            free_EncTicketPart(&t);
-           krb5_clear_error_string (context);
+           krb5_clear_error_message (context);
            return KRB5KRB_AP_ERR_TKT_EXPIRED;
        }
        
@@ -255,7 +259,7 @@ krb5_decrypt_ticket(krb5_context context,
            }
        }
     }
-    
+
     if(out)
        *out = t;
     else
@@ -263,7 +267,7 @@ krb5_decrypt_ticket(krb5_context context,
     return 0;
 }
 
-krb5_error_code KRB5_LIB_FUNCTION
+KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
 krb5_verify_authenticator_checksum(krb5_context context,
                                   krb5_auth_context ac,
                                   void *data,
@@ -273,7 +277,7 @@ krb5_verify_authenticator_checksum(krb5_context context,
     krb5_keyblock *key;
     krb5_authenticator authenticator;
     krb5_crypto crypto;
-    
+
     ret = krb5_auth_con_getauthenticator (context,
                                      ac,
                                      &authenticator);
@@ -305,7 +309,7 @@ out:
 }
 
 
-krb5_error_code KRB5_LIB_FUNCTION
+KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
 krb5_verify_ap_req(krb5_context context,
                   krb5_auth_context *auth_context,
                   krb5_ap_req *ap_req,
@@ -326,7 +330,7 @@ krb5_verify_ap_req(krb5_context context,
                                KRB5_KU_AP_REQ_AUTH);
 }
 
-krb5_error_code KRB5_LIB_FUNCTION
+KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
 krb5_verify_ap_req2(krb5_context context,
                    krb5_auth_context *auth_context,
                    krb5_ap_req *ap_req,
@@ -341,7 +345,7 @@ krb5_verify_ap_req2(krb5_context context,
     krb5_auth_context ac;
     krb5_error_code ret;
     EtypeList etypes;
-    
+
     if (ticket)
        *ticket = NULL;
 
@@ -356,42 +360,37 @@ krb5_verify_ap_req2(krb5_context context,
     t = calloc(1, sizeof(*t));
     if (t == NULL) {
        ret = ENOMEM;
-       krb5_clear_error_string (context);
+       krb5_clear_error_message (context);
        goto out;
     }
 
     if (ap_req->ap_options.use_session_key && ac->keyblock){
-       ret = krb5_decrypt_ticket(context, &ap_req->ticket, 
-                                 ac->keyblock, 
+       ret = krb5_decrypt_ticket(context, &ap_req->ticket,
+                                 ac->keyblock,
                                  &t->ticket,
                                  flags);
        krb5_free_keyblock(context, ac->keyblock);
        ac->keyblock = NULL;
     }else
-       ret = krb5_decrypt_ticket(context, &ap_req->ticket, 
-                                 keyblock, 
+       ret = krb5_decrypt_ticket(context, &ap_req->ticket,
+                                 keyblock,
                                  &t->ticket,
                                  flags);
-    
+
     if(ret)
        goto out;
 
     ret = _krb5_principalname2krb5_principal(context,
                                             &t->server,
-                                            ap_req->ticket.sname, 
+                                            ap_req->ticket.sname,
                                             ap_req->ticket.realm);
     if (ret) goto out;
     ret = _krb5_principalname2krb5_principal(context,
                                             &t->client,
-                                            t->ticket.cname, 
+                                            t->ticket.cname,
                                             t->ticket.crealm);
     if (ret) goto out;
 
-    /* save key */
-
-    ret = krb5_copy_keyblock(context, &t->ticket.key, &ac->keyblock);
-    if (ret) goto out;
-
     ret = decrypt_authenticator (context,
                                 &t->ticket.key,
                                 &ap_req->authenticator,
@@ -409,7 +408,7 @@ krb5_verify_ap_req2(krb5_context context,
                                           ac->authenticator->cname,
                                           ac->authenticator->crealm);
        _krb5_principalname2krb5_principal(context,
-                                          &p2, 
+                                          &p2,
                                           t->ticket.cname,
                                           t->ticket.crealm);
        res = krb5_principal_compare (context, p1, p2);
@@ -417,7 +416,7 @@ krb5_verify_ap_req2(krb5_context context,
        krb5_free_principal (context, p2);
        if (!res) {
            ret = KRB5KRB_AP_ERR_BADMATCH;
-           krb5_clear_error_string (context);
+           krb5_clear_error_message (context);
            goto out;
        }
     }
@@ -430,7 +429,7 @@ krb5_verify_ap_req2(krb5_context context,
                                 ac->remote_address,
                                 t->ticket.caddr)) {
        ret = KRB5KRB_AP_ERR_BADADDR;
-       krb5_clear_error_string (context);
+       krb5_clear_error_message (context);
        goto out;
     }
 
@@ -442,7 +441,7 @@ krb5_verify_ap_req2(krb5_context context,
 
        if (abs(ac->authenticator->ctime - now) > context->max_skew) {
            ret = KRB5KRB_AP_ERR_SKEW;
-           krb5_clear_error_string (context);
+           krb5_clear_error_message (context);
            goto out;
        }
     }
@@ -477,6 +476,10 @@ krb5_verify_ap_req2(krb5_context context,
        }
     }
 
+    /* save key */
+    ret = krb5_copy_keyblock(context, &t->ticket.key, &ac->keyblock);
+    if (ret) goto out;
+
     if (ap_req_options) {
        *ap_req_options = 0;
        if (ac->keytype != ETYPE_NULL)
@@ -505,9 +508,226 @@ krb5_verify_ap_req2(krb5_context context,
        krb5_auth_con_free (context, ac);
     return ret;
 }
-                  
+               
+/*
+ *
+ */
+
+struct krb5_rd_req_in_ctx_data {
+    krb5_keytab keytab;
+    krb5_keyblock *keyblock;
+    krb5_boolean check_pac;
+};
+
+struct krb5_rd_req_out_ctx_data {
+    krb5_keyblock *keyblock;
+    krb5_flags ap_req_options;
+    krb5_ticket *ticket;
+    krb5_principal server;
+};
+
+/**
+ * Allocate a krb5_rd_req_in_ctx as an input parameter to
+ * krb5_rd_req_ctx(). The caller should free the context with
+ * krb5_rd_req_in_ctx_free() when done with the context.
+ *
+ * @param context Keberos 5 context.
+ * @param ctx in ctx to krb5_rd_req_ctx().
+ *
+ * @return Kerberos 5 error code, see krb5_get_error_message().
+ *
+ * @ingroup krb5_auth
+ */
+
+KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
+krb5_rd_req_in_ctx_alloc(krb5_context context, krb5_rd_req_in_ctx *ctx)
+{
+    *ctx = calloc(1, sizeof(**ctx));
+    if (*ctx == NULL) {
+       krb5_set_error_message(context, ENOMEM,
+                              N_("malloc: out of memory", ""));
+       return ENOMEM;
+    }
+    (*ctx)->check_pac = (context->flags & KRB5_CTX_F_CHECK_PAC) ? 1 : 0;
+    return 0;
+}
+
+/**
+ * Set the keytab that krb5_rd_req_ctx() will use.
+ *
+ * @param context Keberos 5 context.
+ * @param in in ctx to krb5_rd_req_ctx().
+ * @param keytab keytab that krb5_rd_req_ctx() will use, only copy the
+ *        pointer, so the caller must free they keytab after
+ *        krb5_rd_req_in_ctx_free() is called.
+ *
+ * @return Kerberos 5 error code, see krb5_get_error_message().
+ *
+ * @ingroup krb5_auth
+ */
+
+KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
+krb5_rd_req_in_set_keytab(krb5_context context,
+                         krb5_rd_req_in_ctx in,
+                         krb5_keytab keytab)
+{
+    in->keytab = keytab;
+    return 0;
+}
+
+/**
+ * Set if krb5_rq_red() is going to check the Windows PAC or not
+ *
+ * @param context Keberos 5 context.
+ * @param in krb5_rd_req_in_ctx to check the option on.
+ * @param flag flag to select if to check the pac (TRUE) or not (FALSE).
+ *
+ * @return Kerberos 5 error code, see krb5_get_error_message().
+ *
+ * @ingroup krb5_auth
+ */
+
+KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
+krb5_rd_req_in_set_pac_check(krb5_context context,
+                            krb5_rd_req_in_ctx in,
+                            krb5_boolean flag)
+{
+    in->check_pac = flag;
+    return 0;
+}
+
+
+KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
+krb5_rd_req_in_set_keyblock(krb5_context context,
+                           krb5_rd_req_in_ctx in,
+                           krb5_keyblock *keyblock)
+{
+    in->keyblock = keyblock; /* XXX should make copy */
+    return 0;
+}
+
+KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
+krb5_rd_req_out_get_ap_req_options(krb5_context context,
+                                  krb5_rd_req_out_ctx out,
+                                  krb5_flags *ap_req_options)
+{
+    *ap_req_options = out->ap_req_options;
+    return 0;
+}
+
+KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
+krb5_rd_req_out_get_ticket(krb5_context context,
+                           krb5_rd_req_out_ctx out,
+                           krb5_ticket **ticket)
+{
+    return krb5_copy_ticket(context, out->ticket, ticket);
+}
+
+KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
+krb5_rd_req_out_get_keyblock(krb5_context context,
+                           krb5_rd_req_out_ctx out,
+                           krb5_keyblock **keyblock)
+{
+    return krb5_copy_keyblock(context, out->keyblock, keyblock);
+}
+
+/**
+ * Get the principal that was used in the request from the
+ * client. Might not match whats in the ticket if krb5_rd_req_ctx()
+ * searched in the keytab for a matching key.
+ *
+ * @param context a Kerberos 5 context.
+ * @param out a krb5_rd_req_out_ctx from krb5_rd_req_ctx().
+ * @param principal return principal, free with krb5_free_principal().
+ *
+ * @ingroup krb5_auth
+ */
+
+KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
+krb5_rd_req_out_get_server(krb5_context context,
+                           krb5_rd_req_out_ctx out,
+                           krb5_principal *principal)
+{
+    return krb5_copy_principal(context, out->server, principal);
+}
+
+KRB5_LIB_FUNCTION void KRB5_LIB_CALL
+krb5_rd_req_in_ctx_free(krb5_context context, krb5_rd_req_in_ctx ctx)
+{
+    free(ctx);
+}
+
+/**
+ * Free the krb5_rd_req_out_ctx.
+ *
+ * @param context Keberos 5 context.
+ * @param ctx krb5_rd_req_out_ctx context to free.
+ *
+ * @ingroup krb5_auth
+ */
+
+KRB5_LIB_FUNCTION void KRB5_LIB_CALL
+krb5_rd_req_out_ctx_free(krb5_context context, krb5_rd_req_out_ctx ctx)
+{
+    if (ctx->ticket)
+       krb5_free_ticket(context, ctx->ticket);
+    if (ctx->keyblock)
+       krb5_free_keyblock(context, ctx->keyblock);
+    if (ctx->server)
+       krb5_free_principal(context, ctx->server);
+    free(ctx);
+}
+
+/*
+ *
+ */
+
+KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
+krb5_rd_req(krb5_context context,
+           krb5_auth_context *auth_context,
+           const krb5_data *inbuf,
+           krb5_const_principal server,
+           krb5_keytab keytab,
+           krb5_flags *ap_req_options,
+           krb5_ticket **ticket)
+{
+    krb5_error_code ret;
+    krb5_rd_req_in_ctx in;
+    krb5_rd_req_out_ctx out;
+
+    ret = krb5_rd_req_in_ctx_alloc(context, &in);
+    if (ret)
+       return ret;
+
+    ret = krb5_rd_req_in_set_keytab(context, in, keytab);
+    if (ret) {
+       krb5_rd_req_in_ctx_free(context, in);
+       return ret;
+    }
+
+    ret = krb5_rd_req_ctx(context, auth_context, inbuf, server, in, &out);
+    krb5_rd_req_in_ctx_free(context, in);
+    if (ret)
+       return ret;
+
+    if (ap_req_options)
+       *ap_req_options = out->ap_req_options;
+    if (ticket) {
+       ret = krb5_copy_ticket(context, out->ticket, ticket);
+       if (ret)
+           goto out;
+    }
+
+out:
+    krb5_rd_req_out_ctx_free(context, out);
+    return ret;
+}
 
-krb5_error_code KRB5_LIB_FUNCTION
+/*
+ *
+ */
+
+KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
 krb5_rd_req_with_keyblock(krb5_context context,
                          krb5_auth_context *auth_context,
                          const krb5_data *inbuf,
@@ -517,34 +737,43 @@ krb5_rd_req_with_keyblock(krb5_context context,
                          krb5_ticket **ticket)
 {
     krb5_error_code ret;
-    krb5_ap_req ap_req;
+    krb5_rd_req_in_ctx in;
+    krb5_rd_req_out_ctx out;
 
-    if (*auth_context == NULL) {
-       ret = krb5_auth_con_init(context, auth_context);
-       if (ret)
-           return ret;
+    ret = krb5_rd_req_in_ctx_alloc(context, &in);
+    if (ret)
+       return ret;
+
+    ret = krb5_rd_req_in_set_keyblock(context, in, keyblock);
+    if (ret) {
+       krb5_rd_req_in_ctx_free(context, in);
+       return ret;
     }
 
-    ret = krb5_decode_ap_req(context, inbuf, &ap_req);
-    if(ret)
+    ret = krb5_rd_req_ctx(context, auth_context, inbuf, server, in, &out);
+    krb5_rd_req_in_ctx_free(context, in);
+    if (ret)
        return ret;
 
-    ret = krb5_verify_ap_req(context,
-                            auth_context,
-                            &ap_req,
-                            server,
-                            keyblock,
-                            0,
-                            ap_req_options,
-                            ticket);
+    if (ap_req_options)
+       *ap_req_options = out->ap_req_options;
+    if (ticket) {
+       ret = krb5_copy_ticket(context, out->ticket, ticket);
+       if (ret)
+           goto out;
+    }
 
-    free_AP_REQ(&ap_req);
+out:
+    krb5_rd_req_out_ctx_free(context, out);
     return ret;
 }
 
+/*
+ *
+ */
+
 static krb5_error_code
 get_key_from_keytab(krb5_context context,
-                   krb5_auth_context *auth_context,
                    krb5_ap_req *ap_req,
                    krb5_const_principal server,
                    krb5_keytab keytab,
@@ -559,7 +788,7 @@ get_key_from_keytab(krb5_context context,
        krb5_kt_default(context, &real_keytab);
     else
        real_keytab = keytab;
-    
+
     if (ap_req->ticket.enc_part.kvno)
        kvno = *ap_req->ticket.enc_part.kvno;
     else
@@ -575,111 +804,275 @@ get_key_from_keytab(krb5_context context,
        goto out;
     ret = krb5_copy_keyblock(context, &entry.keyblock, out_key);
     krb5_kt_free_entry (context, &entry);
-out:    
+out:
     if(keytab == NULL)
        krb5_kt_close(context, real_keytab);
-    
+
     return ret;
 }
 
-krb5_error_code KRB5_LIB_FUNCTION
-krb5_rd_req_return_keyblock(krb5_context context,
-                           krb5_auth_context *auth_context,
-                           const krb5_data *inbuf,
-                           krb5_const_principal server,
-                           krb5_keytab keytab,
-                           krb5_flags *ap_req_options,
-                           krb5_ticket **ticket, 
-                           krb5_keyblock **return_keyblock)
+/**
+ * The core server function that verify application authentication
+ * requests from clients.
+ *
+ * @param context Keberos 5 context.
+ * @param auth_context the authentication context, can be NULL, then
+ *        default values for the authentication context will used.
+ * @param inbuf the (AP-REQ) authentication buffer
+ *
+ * @param server the server with authenticate as, if NULL the function
+ *        will try to find any available credential in the keytab
+ *        that will verify the reply. The function will prefer the
+ *        server the server client specified in the AP-REQ, but if
+ *        there is no mach, it will try all keytab entries for a
+ *        match. This have serious performance issues for larger keytabs.
+ *
+ * @param inctx control the behavior of the function, if NULL, the
+ *        default behavior is used.
+ * @param outctx the return outctx, free with krb5_rd_req_out_ctx_free().
+ * @return Kerberos 5 error code, see krb5_get_error_message().
+ *
+ * @ingroup krb5_auth
+ */
+
+KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
+krb5_rd_req_ctx(krb5_context context,
+               krb5_auth_context *auth_context,
+               const krb5_data *inbuf,
+               krb5_const_principal server,
+               krb5_rd_req_in_ctx inctx,
+               krb5_rd_req_out_ctx *outctx)
 {
     krb5_error_code ret;
     krb5_ap_req ap_req;
-    krb5_keyblock *keyblock = NULL;
+    krb5_rd_req_out_ctx o = NULL;
+    krb5_keytab id = NULL, keytab = NULL;
     krb5_principal service = NULL;
 
-    if (return_keyblock)
-       *return_keyblock = NULL;
+    *outctx = NULL;
+
+    o = calloc(1, sizeof(*o));
+    if (o == NULL) {
+       krb5_set_error_message(context, ENOMEM,
+                              N_("malloc: out of memory", ""));
+       return ENOMEM;
+    }
 
     if (*auth_context == NULL) {
        ret = krb5_auth_con_init(context, auth_context);
        if (ret)
-           return ret;
+           goto out;
     }
 
     ret = krb5_decode_ap_req(context, inbuf, &ap_req);
     if(ret)
-       return ret;
+       goto out;
+
+    /* Save that principal that was in the request */
+    ret = _krb5_principalname2krb5_principal(context,
+                                            &o->server,
+                                            ap_req.ticket.sname,
+                                            ap_req.ticket.realm);
+    if (ret)
+       goto out;
 
-    if(server == NULL){
-       _krb5_principalname2krb5_principal(context,
-                                          &service,
-                                          ap_req.ticket.sname,
-                                          ap_req.ticket.realm);
-       server = service;
-    }
     if (ap_req.ap_options.use_session_key &&
        (*auth_context)->keyblock == NULL) {
-       krb5_set_error_string(context, "krb5_rd_req: user to user auth "
-                             "without session key given");
        ret = KRB5KRB_AP_ERR_NOKEY;
+       krb5_set_error_message(context, ret,
+                              N_("krb5_rd_req: user to user auth "
+                                 "without session key given", ""));
        goto out;
     }
 
-    if((*auth_context)->keyblock == NULL){
-       ret = get_key_from_keytab(context, 
-                                 auth_context, 
+    if (inctx && inctx->keytab)
+       id = inctx->keytab;
+
+    if((*auth_context)->keyblock){
+       ret = krb5_copy_keyblock(context,
+                                (*auth_context)->keyblock,
+                                &o->keyblock);
+       if (ret)
+           goto out;
+    } else if(inctx && inctx->keyblock){
+       ret = krb5_copy_keyblock(context,
+                                inctx->keyblock,
+                                &o->keyblock);
+       if (ret)
+           goto out;
+    } else {
+
+       if(id == NULL) {
+           krb5_kt_default(context, &keytab);
+           id = keytab;
+       }
+       if (id == NULL)
+           goto out;
+
+       if (server == NULL) {
+           ret = _krb5_principalname2krb5_principal(context,
+                                                    &service,
+                                                    ap_req.ticket.sname,
+                                                    ap_req.ticket.realm);
+           if (ret)
+               goto out;
+           server = service;
+       }
+
+       ret = get_key_from_keytab(context,
+                                 &ap_req,
+                                 server,
+                                 id,
+                                 &o->keyblock);
+       if (ret) {
+           /* If caller specified a server, fail. */
+           if (service == NULL)
+               goto out;
+           /* Otherwise, fall back to iterating over the keytab. This
+            * have serious performace issues for larger keytab.
+            */
+           o->keyblock = NULL;
+       }
+    }
+
+    if (o->keyblock) {
+       /*
+        * We got an exact keymatch, use that.
+        */
+
+       ret = krb5_verify_ap_req2(context,
+                                 auth_context,
                                  &ap_req,
                                  server,
-                                 keytab,
-                                 &keyblock);
-       if(ret)
+                                 o->keyblock,
+                                 0,
+                                 &o->ap_req_options,
+                                 &o->ticket,
+                                 KRB5_KU_AP_REQ_AUTH);
+       
+       if (ret)
            goto out;
+
     } else {
-       ret = krb5_copy_keyblock(context,
-                                (*auth_context)->keyblock,
-                                &keyblock);
+       /*
+        * Interate over keytab to find a key that can decrypt the request.
+        */
+
+       krb5_keytab_entry entry;
+       krb5_kt_cursor cursor;
+       int done = 0, kvno = 0;
+
+       memset(&cursor, 0, sizeof(cursor));
+
+       if (ap_req.ticket.enc_part.kvno)
+           kvno = *ap_req.ticket.enc_part.kvno;
+
+       ret = krb5_kt_start_seq_get(context, id, &cursor);
        if (ret)
            goto out;
-    }
 
-    ret = krb5_verify_ap_req(context,
-                            auth_context,
-                            &ap_req,
-                            server,
-                            keyblock,
-                            0,
-                            ap_req_options,
-                            ticket);
+       done = 0;
+       while (!done) { 
+           krb5_principal p;
 
-    if (ret == 0 && return_keyblock)
-       *return_keyblock = keyblock;
-    else
-        krb5_free_keyblock(context, keyblock);
+           ret = krb5_kt_next_entry(context, id, &entry, &cursor);
+           if (ret) {
+               _krb5_kt_principal_not_found(context, ret, id, o->server,
+                                            ap_req.ticket.enc_part.etype,
+                                            kvno);
+               goto out;
+           }
 
+           if (entry.keyblock.keytype != ap_req.ticket.enc_part.etype ||
+               (kvno && kvno != entry.vno)) {
+               krb5_kt_free_entry (context, &entry);
+               continue;
+           }
+
+           ret = krb5_verify_ap_req2(context,
+                                     auth_context,
+                                     &ap_req,
+                                     server,
+                                     &entry.keyblock,
+                                     0,
+                                     &o->ap_req_options,
+                                     &o->ticket,
+                                     KRB5_KU_AP_REQ_AUTH);
+           if (ret) {
+               krb5_kt_free_entry (context, &entry);
+               continue;
+           }
+
+           /*
+            * Found a match, save the keyblock for PAC processing,
+            * and update the service principal in the ticket to match
+            * whatever is in the keytab.
+            */
+           
+           ret = krb5_copy_keyblock(context, 
+                                    &entry.keyblock,
+                                    &o->keyblock);
+           if (ret) {
+               krb5_kt_free_entry (context, &entry);
+               goto out;
+           }       
+
+           ret = krb5_copy_principal(context, entry.principal, &p);
+           if (ret) {
+               krb5_kt_free_entry (context, &entry);
+               goto out;
+           }
+           krb5_free_principal(context, o->ticket->server);
+           o->ticket->server = p;
+           
+           krb5_kt_free_entry (context, &entry);
+
+           done = 1;
+       }
+       krb5_kt_end_seq_get (context, id, &cursor);
+    }
+
+    /* If there is a PAC, verify its server signature */
+    if (inctx == NULL || inctx->check_pac) {
+       krb5_pac pac;
+       krb5_data data;
+
+       ret = krb5_ticket_get_authorization_data_type(context,
+                                                     o->ticket,
+                                                     KRB5_AUTHDATA_WIN2K_PAC,
+                                                     &data);
+       if (ret == 0) {
+           ret = krb5_pac_parse(context, data.data, data.length, &pac);
+           krb5_data_free(&data);
+           if (ret)
+               goto out;
+       
+           ret = krb5_pac_verify(context,
+                                 pac,
+                                 o->ticket->ticket.authtime,
+                                 o->ticket->client,
+                                 o->keyblock,
+                                 NULL);
+           krb5_pac_free(context, pac);
+           if (ret)
+               goto out;
+       } else
+         ret = 0;
+    }
 out:
+
+    if (ret || outctx == NULL) {
+       krb5_rd_req_out_ctx_free(context, o);
+    } else
+       *outctx = o;
+
     free_AP_REQ(&ap_req);
-    if(service)
+
+    if (service)
        krb5_free_principal(context, service);
-    return ret;
-}
 
-krb5_error_code KRB5_LIB_FUNCTION
-krb5_rd_req(krb5_context context,
-           krb5_auth_context *auth_context,
-           const krb5_data *inbuf,
-           krb5_const_principal server,
-           krb5_keytab keytab,
-           krb5_flags *ap_req_options,
-           krb5_ticket **ticket)
-{
-    return krb5_rd_req_return_keyblock(context,
-                                      auth_context,
-                                      inbuf,
-                                      server,
-                                      keytab,
-                                      ap_req_options,
-                                      ticket,
-                                      NULL);
+    if (keytab)
+       krb5_kt_close(context, keytab);
 
+    return ret;
 }
-