s3-kerberos: do not include authdata headers before including krb5 headers.
[ira/wip.git] / source3 / libads / authdata.c
index 86e3e9edcf03793c16dbb412f708f0752fa3f67a..ed158ee2d8c0cf2387768720247d947413054f2c 100644 (file)
-/* 
+/*
    Unix SMB/CIFS implementation.
    kerberos authorization data (PAC) utility library
-   Copyright (C) Jim McDonough <jmcd@us.ibm.com> 2003   
+   Copyright (C) Jim McDonough <jmcd@us.ibm.com> 2003
    Copyright (C) Andrew Bartlett <abartlet@samba.org> 2004-2005
    Copyright (C) Andrew Tridgell 2001
    Copyright (C) Luke Howard 2002-2003
    Copyright (C) Stefan Metzmacher 2004-2005
-   Copyright (C) Guenther Deschner 2005
-   
+   Copyright (C) Guenther Deschner 2005,2007,2008
+
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
-   
+
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
-   
+
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "includes.h"
+#include "librpc/gen_ndr/ndr_krb5pac.h"
+#include "smb_krb5.h"
+#include "authdata.h"
 
 #ifdef HAVE_KRB5
 
-static BOOL pac_io_logon_name(const char *desc, PAC_LOGON_NAME *logon_name,
-                             prs_struct *ps, int depth)
-{
-       if (NULL == logon_name)
-               return False;
-
-       prs_debug(ps, depth, desc, "pac_io_logon_name");
-       depth++;
+/****************************************************************
+****************************************************************/
 
-       if (!smb_io_time("logon_time", &logon_name->logon_time, ps, depth))
-               return False;
-
-       if (!prs_uint16("len", ps, depth, &logon_name->len))
-               return False;
-
-       /* The following string is always in little endian 16 bit values,
-          copy as 8 bits to avoid endian reversal on big-endian machines.
-          len is the length in bytes. */
-
-       if (UNMARSHALLING(ps) && logon_name->len) {
-               logon_name->username = PRS_ALLOC_MEM(ps, uint8, logon_name->len);
-               if (!logon_name->username) {
-                       DEBUG(3, ("No memory available\n"));
-                       return False;
-               }
-       }
-
-       if (!prs_uint8s(True, "name", ps, depth, logon_name->username, logon_name->len))
-               return False;
+static krb5_error_code check_pac_checksum(TALLOC_CTX *mem_ctx,
+                                         DATA_BLOB pac_data,
+                                         struct PAC_SIGNATURE_DATA *sig,
+                                         krb5_context context,
+                                         krb5_keyblock *keyblock)
+{
+       krb5_error_code ret;
+       krb5_checksum cksum;
+       krb5_keyusage usage = 0;
 
-       return True;
-}
+       smb_krb5_checksum_from_pac_sig(&cksum, sig);
 
-#if 0 /* Unused (handled now in net_io_user_info3()) - Guenther */
-static BOOL pac_io_krb_sids(const char *desc, KRB_SID_AND_ATTRS *sid_and_attr,
-                           prs_struct *ps, int depth)
-{
-       if (NULL == sid_and_attr)
-               return False;
+#ifdef HAVE_KRB5_KU_OTHER_CKSUM /* Heimdal */
+       usage = KRB5_KU_OTHER_CKSUM;
+#elif defined(HAVE_KRB5_KEYUSAGE_APP_DATA_CKSUM) /* MIT */
+       usage = KRB5_KEYUSAGE_APP_DATA_CKSUM;
+#else
+#error UNKNOWN_KRB5_KEYUSAGE
+#endif
 
-       prs_debug(ps, depth, desc, "pac_io_krb_sids");
-       depth++;
+       ret = smb_krb5_verify_checksum(context,
+                                      keyblock,
+                                      usage,
+                                      &cksum,
+                                      pac_data.data,
+                                      pac_data.length);
 
-       if (UNMARSHALLING(ps)) {
-               sid_and_attr->sid = PRS_ALLOC_MEM(ps, DOM_SID2, 1);
-               if (!sid_and_attr->sid) {
-                       DEBUG(3, ("No memory available\n"));
-                       return False;
-               }
+       if (ret) {
+               DEBUG(2,("check_pac_checksum: PAC Verification failed: %s (%d)\n",
+                       error_message(ret), ret));
+               return ret;
        }
 
-       if(!smb_io_dom_sid2("sid", sid_and_attr->sid, ps, depth))
-               return False;
-
-       return True;
+       return ret;
 }
 
+/****************************************************************
+****************************************************************/
 
-static BOOL pac_io_krb_attrs(const char *desc, KRB_SID_AND_ATTRS *sid_and_attr,
-                            prs_struct *ps, int depth)
+ NTSTATUS decode_pac_data(TALLOC_CTX *mem_ctx,
+                        DATA_BLOB *pac_data_blob,
+                        krb5_context context,
+                        krb5_keyblock *service_keyblock,
+                        krb5_const_principal client_principal,
+                        time_t tgs_authtime,
+                        struct PAC_DATA **pac_data_out)
 {
-       if (NULL == sid_and_attr)
-               return False;
-
-       prs_debug(ps, depth, desc, "pac_io_krb_attrs");
-       depth++;
-
-       if (!prs_uint32("sid_ptr", ps, depth, &sid_and_attr->sid_ptr))
-               return False;
-       if (!prs_uint32("attrs", ps, depth, &sid_and_attr->attrs))
-               return False;
-
-       return True;
-}
+       NTSTATUS status;
+       enum ndr_err_code ndr_err;
+       krb5_error_code ret;
+       DATA_BLOB modified_pac_blob;
 
-static BOOL pac_io_krb_sid_and_attr_array(const char *desc, 
-                                         KRB_SID_AND_ATTR_ARRAY *array,
-                                         uint32 num,
-                                         prs_struct *ps, int depth)
-{
+       NTTIME tgs_authtime_nttime;
+       krb5_principal client_principal_pac = NULL;
        int i;
 
-       if (NULL == array)
-               return False;
-
-       prs_debug(ps, depth, desc, "pac_io_krb_sid_and_attr_array");
-       depth++;
-
-
-       if (!prs_uint32("count", ps, depth, &array->count))
-               return False;
-
-       if (UNMARSHALLING(ps)) {
-               if (num) {
-                       array->krb_sid_and_attrs = PRS_ALLOC_MEM(ps, KRB_SID_AND_ATTRS, num);
-                       if (!array->krb_sid_and_attrs) {
-                               DEBUG(3, ("No memory available\n"));
-                               return False;
-                       }
-               } else {
-                       array->krb_sid_and_attrs = NULL;
-               }
+       struct PAC_SIGNATURE_DATA *srv_sig_ptr = NULL;
+       struct PAC_SIGNATURE_DATA *kdc_sig_ptr = NULL;
+       struct PAC_SIGNATURE_DATA *srv_sig_wipe = NULL;
+       struct PAC_SIGNATURE_DATA *kdc_sig_wipe = NULL;
+       struct PAC_LOGON_NAME *logon_name = NULL;
+       struct PAC_LOGON_INFO *logon_info = NULL;
+       struct PAC_DATA *pac_data = NULL;
+       struct PAC_DATA_RAW *pac_data_raw = NULL;
+
+       DATA_BLOB *srv_sig_blob = NULL;
+       DATA_BLOB *kdc_sig_blob = NULL;
+
+       *pac_data_out = NULL;
+
+       pac_data = TALLOC_ZERO_P(mem_ctx, struct PAC_DATA);
+       pac_data_raw = TALLOC_ZERO_P(mem_ctx, struct PAC_DATA_RAW);
+       kdc_sig_wipe = TALLOC_ZERO_P(mem_ctx, struct PAC_SIGNATURE_DATA);
+       srv_sig_wipe = TALLOC_ZERO_P(mem_ctx, struct PAC_SIGNATURE_DATA);
+       if (!pac_data_raw || !pac_data || !kdc_sig_wipe || !srv_sig_wipe) {
+               return NT_STATUS_NO_MEMORY;
        }
 
-       for (i=0; i<num; i++) {
-               if (!pac_io_krb_attrs(desc, 
-                                     &array->krb_sid_and_attrs[i],
-                                     ps, depth))
-                       return False;
-
+       ndr_err = ndr_pull_struct_blob(pac_data_blob, pac_data,
+                       NULL, pac_data,
+                      (ndr_pull_flags_fn_t)ndr_pull_PAC_DATA);
+       if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
+               status = ndr_map_error2ntstatus(ndr_err);
+               DEBUG(0,("can't parse the PAC: %s\n",
+                       nt_errstr(status)));
+               return status;
        }
-       for (i=0; i<num; i++) {
-               if (!pac_io_krb_sids(desc, 
-                                    &array->krb_sid_and_attrs[i],
-                                    ps, depth))
-                       return False;
 
+       if (pac_data->num_buffers < 4) {
+               /* we need logon_ingo, service_key and kdc_key */
+               DEBUG(0,("less than 4 PAC buffers\n"));
+               return NT_STATUS_INVALID_PARAMETER;
        }
 
-       return True;
-
-}
-#endif
-
-static BOOL pac_io_group_membership(const char *desc, 
-                                   GROUP_MEMBERSHIP *membership,
-                                   prs_struct *ps, int depth)
-{
-       if (NULL == membership)
-               return False;
-
-       prs_debug(ps, depth, desc, "pac_io_group_membership");
-       depth++;
-
-       if (!prs_uint32("rid", ps, depth, &membership->rid))
-               return False;
-       if (!prs_uint32("attrs", ps, depth, &membership->attrs))
-               return False;
-
-       return True;
-}
-
-
-static BOOL pac_io_group_membership_array(const char *desc, 
-                                         GROUP_MEMBERSHIP_ARRAY *array,
-                                         uint32 num,
-                                         prs_struct *ps, int depth)
-{
-       int i;
-
-       if (NULL == array)
-               return False;
-
-       prs_debug(ps, depth, desc, "pac_io_group_membership_array");
-       depth++;
-
-
-       if (!prs_uint32("count", ps, depth, &array->count))
-               return False;
-
-       if (UNMARSHALLING(ps)) {
-               if (num) {
-                       array->group_membership = PRS_ALLOC_MEM(ps, GROUP_MEMBERSHIP, num);
-                       if (!array->group_membership) {
-                               DEBUG(3, ("No memory available\n"));
-                               return False;
-                       }
-               } else {
-                       array->group_membership = NULL;
-               }
+       ndr_err = ndr_pull_struct_blob(pac_data_blob, pac_data_raw,
+                                      NULL, pac_data_raw,
+                                      (ndr_pull_flags_fn_t)ndr_pull_PAC_DATA_RAW);
+       if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
+               status = ndr_map_error2ntstatus(ndr_err);
+               DEBUG(0,("can't parse the PAC: %s\n",
+                       nt_errstr(status)));
+               return status;
        }
 
-       for (i=0; i<num; i++) {
-               if (!pac_io_group_membership(desc, 
-                                            &array->group_membership[i],
-                                            ps, depth))
-                       return False;
-
+       if (pac_data_raw->num_buffers < 4) {
+               /* we need logon_ingo, service_key and kdc_key */
+               DEBUG(0,("less than 4 PAC buffers\n"));
+               return NT_STATUS_INVALID_PARAMETER;
        }
 
-       return True;
-
-}
+       if (pac_data->num_buffers != pac_data_raw->num_buffers) {
+               /* we need logon_ingo, service_key and kdc_key */
+               DEBUG(0,("misparse!  PAC_DATA has %d buffers while PAC_DATA_RAW has %d\n",
+                        pac_data->num_buffers, pac_data_raw->num_buffers));
+               return NT_STATUS_INVALID_PARAMETER;
+       }
 
-#if 0 /* Unused, replaced using an expanded net_io_user_info3() now - Guenther */
-static BOOL pac_io_pac_logon_info(const char *desc, PAC_LOGON_INFO *info, 
-                                 prs_struct *ps, int depth)
-{
-       uint32 garbage, i;
-
-       if (NULL == info)
-               return False;
-
-       prs_debug(ps, depth, desc, "pac_io_pac_logon_info");
-       depth++;
-
-       if (!prs_align(ps))
-               return False;
-       if (!prs_uint32("unknown", ps, depth, &garbage)) /* 00081001 */
-               return False;
-       if (!prs_uint32("unknown", ps, depth, &garbage)) /* cccccccc */
-               return False;
-       if (!prs_uint32("bufferlen", ps, depth, &garbage))
-               return False;
-       if (!prs_uint32("bufferlenhi", ps, depth, &garbage)) /* 00000000 */
-               return False;
-
-       if (!prs_uint32("pointer", ps, depth, &garbage))
-               return False;
-
-       if (!prs_align(ps))
-               return False;
-       if (!smb_io_time("logon_time", &info->logon_time, ps, depth))
-               return False;
-       if (!smb_io_time("logoff_time", &info->logoff_time, ps, depth))
-               return False;
-       if (!smb_io_time("kickoff_time", &info->kickoff_time, ps, depth))
-               return False;
-       if (!smb_io_time("pass_last_set_time", &info->pass_last_set_time, 
-                        ps, depth))
-               return False;
-       if (!smb_io_time("pass_can_change_time", &info->pass_can_change_time, 
-                        ps, depth))
-               return False;
-       if (!smb_io_time("pass_must_change_time", &info->pass_must_change_time,
-                        ps, depth))
-               return False;
-
-       if (!smb_io_unihdr("hdr_user_name", &info->hdr_user_name, ps, depth))
-               return False;
-       if (!smb_io_unihdr("hdr_full_name", &info->hdr_full_name, ps, depth))
-               return False;
-       if (!smb_io_unihdr("hdr_logon_script", &info->hdr_logon_script, 
-                          ps, depth))
-               return False;
-       if (!smb_io_unihdr("hdr_profile_path", &info->hdr_profile_path, 
-                          ps, depth))
-               return False;
-       if (!smb_io_unihdr("hdr_home_dir", &info->hdr_home_dir, ps, depth))
-               return False;
-       if (!smb_io_unihdr("hdr_dir_drive", &info->hdr_dir_drive, ps, depth))
-               return False;
-
-       if (!prs_uint16("logon_count", ps, depth, &info->logon_count))
-               return False;
-       if (!prs_uint16("bad_password_count", ps, depth, &info->bad_password_count))
-               return False;
-       if (!prs_uint32("user_rid", ps, depth, &info->user_rid))
-               return False;
-       if (!prs_uint32("group_rid", ps, depth, &info->group_rid))
-               return False;
-       if (!prs_uint32("group_count", ps, depth, &info->group_count))
-               return False;
-       /* I haven't seen this contain anything yet, but when it does
-          we will have to make sure we decode the contents in the middle
-          all the unistr2s ... */
-       if (!prs_uint32("group_mem_ptr", ps, depth, 
-                       &info->group_membership_ptr))
-               return False;
-       if (!prs_uint32("user_flags", ps, depth, &info->user_flags))
-               return False;
-
-       if (!prs_uint8s(False, "session_key", ps, depth, info->session_key, 16)) 
-               return False;
-       
-       if (!smb_io_unihdr("hdr_dom_controller", 
-                          &info->hdr_dom_controller, ps, depth))
-               return False;
-       if (!smb_io_unihdr("hdr_dom_name", &info->hdr_dom_name, ps, depth))
-               return False;
-
-       /* this should be followed, but just get ptr for now */
-       if (!prs_uint32("ptr_dom_sid", ps, depth, &info->ptr_dom_sid))
-               return False;
-
-       if (!prs_uint8s(False, "lm_session_key", ps, depth, info->lm_session_key, 8)) 
-               return False;
-
-       if (!prs_uint32("acct_flags", ps, depth, &info->acct_flags))
-               return False;
-
-       for (i = 0; i < 7; i++)
-       {
-               if (!prs_uint32("unkown", ps, depth, &info->unknown[i])) /* unknown */
-                        return False;
-       }
-
-       if (!prs_uint32("sid_count", ps, depth, &info->sid_count))
-               return False;
-       if (!prs_uint32("ptr_extra_sids", ps, depth, &info->ptr_extra_sids))
-               return False;
-       if (!prs_uint32("ptr_res_group_dom_sid", ps, depth, 
-                       &info->ptr_res_group_dom_sid))
-               return False;
-       if (!prs_uint32("res_group_count", ps, depth, &info->res_group_count))
-               return False;
-       if (!prs_uint32("ptr_res_groups", ps, depth, &info->ptr_res_groups))
-               return False;
-
-       if(!smb_io_unistr2("uni_user_name", &info->uni_user_name, 
-                          info->hdr_user_name.buffer, ps, depth))
-               return False;
-       if(!smb_io_unistr2("uni_full_name", &info->uni_full_name, 
-                          info->hdr_full_name.buffer, ps, depth))
-               return False;
-       if(!smb_io_unistr2("uni_logon_script", &info->uni_logon_script, 
-                          info->hdr_logon_script.buffer, ps, depth))
-               return False;
-       if(!smb_io_unistr2("uni_profile_path", &info->uni_profile_path,
-                          info->hdr_profile_path.buffer, ps, depth))
-               return False;
-       if(!smb_io_unistr2("uni_home_dir", &info->uni_home_dir,
-                          info->hdr_home_dir.buffer, ps, depth))
-               return False;
-       if(!smb_io_unistr2("uni_dir_drive", &info->uni_dir_drive,
-                          info->hdr_dir_drive.buffer, ps, depth))
-               return False;
-
-       if (info->group_membership_ptr) {
-               if (!pac_io_group_membership_array("group membership",
-                                                  &info->groups,
-                                                  info->group_count,
-                                                  ps, depth))
-                       return False;
-       }
-
-
-       if(!smb_io_unistr2("uni_dom_controller", &info->uni_dom_controller,
-                          info->hdr_dom_controller.buffer, ps, depth))
-               return False;
-       if(!smb_io_unistr2("uni_dom_name", &info->uni_dom_name, 
-                          info->hdr_dom_name.buffer, ps, depth))
-               return False;
-
-       if(info->ptr_dom_sid)
-               if(!smb_io_dom_sid2("dom_sid", &info->dom_sid, ps, depth))
-                       return False;
-
-       
-       if (info->sid_count && info->ptr_extra_sids)
-               if (!pac_io_krb_sid_and_attr_array("extra_sids", 
-                                                  &info->extra_sids,
-                                                  info->sid_count,
-                                                  ps, depth))
-                       return False;
-
-       if (info->ptr_res_group_dom_sid)
-               if (!smb_io_dom_sid2("res_group_dom_sid", 
-                                    &info->res_group_dom_sid, ps, depth))
-                       return False;
-
-       if (info->ptr_res_groups) {
-
-               if (!(info->user_flgs & LOGON_RESOURCE_GROUPS)) {
-                       DEBUG(0,("user_flgs attribute does not have LOGON_RESOURCE_GROUPS\n"));
-                       /* return False; */
+       for (i=0; i < pac_data->num_buffers; i++) {
+               if (pac_data->buffers[i].type != pac_data_raw->buffers[i].type) {
+                       DEBUG(0,("misparse!  PAC_DATA buffer %d has type %d while PAC_DATA_RAW has %d\n",
+                                i, pac_data->buffers[i].type, pac_data->buffers[i].type));
+                       return NT_STATUS_INVALID_PARAMETER;
+               }
+               switch (pac_data->buffers[i].type) {
+                       case PAC_TYPE_LOGON_INFO:
+                               if (!pac_data->buffers[i].info) {
+                                       break;
+                               }
+                               logon_info = pac_data->buffers[i].info->logon_info.info;
+                               break;
+                       case PAC_TYPE_SRV_CHECKSUM:
+                               if (!pac_data->buffers[i].info) {
+                                       break;
+                               }
+                               srv_sig_ptr = &pac_data->buffers[i].info->srv_cksum;
+                               srv_sig_blob = &pac_data_raw->buffers[i].info->remaining;
+                               break;
+                       case PAC_TYPE_KDC_CHECKSUM:
+                               if (!pac_data->buffers[i].info) {
+                                       break;
+                               }
+                               kdc_sig_ptr = &pac_data->buffers[i].info->kdc_cksum;
+                               kdc_sig_blob = &pac_data_raw->buffers[i].info->remaining;
+                               break;
+                       case PAC_TYPE_LOGON_NAME:
+                               logon_name = &pac_data->buffers[i].info->logon_name;
+                               break;
+                       default:
+                               break;
                }
-
-               if (!pac_io_group_membership_array("res group membership",
-                                                  &info->res_groups,
-                                                  info->res_group_count,
-                                                  ps, depth))
-                       return False;
        }
 
-       return True;
-}
-#endif
-
-static BOOL pac_io_pac_logon_info(const char *desc, PAC_LOGON_INFO *info, 
-                                 prs_struct *ps, int depth)
-{
-       uint32 garbage;
-       BOOL kerb_validation_info = True;
-
-       if (NULL == info)
-               return False;
-
-       prs_debug(ps, depth, desc, "pac_io_pac_logon_info");
-       depth++;
-
-       if (!prs_align(ps))
-               return False;
-       if (!prs_uint32("unknown", ps, depth, &garbage)) /* 00081001 */
-               return False;
-       if (!prs_uint32("unknown", ps, depth, &garbage)) /* cccccccc */
-               return False;
-       if (!prs_uint32("bufferlen", ps, depth, &garbage))
-               return False;
-       if (!prs_uint32("bufferlenhi", ps, depth, &garbage)) /* 00000000 */
-               return False;
-
-       if(!net_io_user_info3("", &info->info3, ps, depth, 3, kerb_validation_info))
-               return False;
-
-       if (info->info3.ptr_res_group_dom_sid) {
-               if (!smb_io_dom_sid2("res_group_dom_sid", 
-                                    &info->res_group_dom_sid, ps, depth))
-                       return False;
+       if (!logon_info) {
+               DEBUG(0,("PAC no logon_info\n"));
+               return NT_STATUS_INVALID_PARAMETER;
        }
 
-       if (info->info3.ptr_res_groups) {
-
-               if (!(info->info3.user_flgs & LOGON_RESOURCE_GROUPS)) {
-                       DEBUG(0,("user_flgs attribute does not have LOGON_RESOURCE_GROUPS\n"));
-                       /* return False; */
-               }
-
-               if (!pac_io_group_membership_array("res group membership",
-                                                  &info->res_groups,
-                                                  info->info3.res_group_count,
-                                                  ps, depth))
-                       return False;
+       if (!logon_name) {
+               DEBUG(0,("PAC no logon_name\n"));
+               return NT_STATUS_INVALID_PARAMETER;
        }
 
-       return True;
-}
-
-
-
-static BOOL pac_io_pac_signature_data(const char *desc, 
-                                     PAC_SIGNATURE_DATA *data, uint32 length,
-                                     prs_struct *ps, int depth)
-{
-       uint32 siglen = 0;
-
-       prs_debug(ps, depth, desc, "pac_io_pac_signature_data");
-       depth++;
-
-       if (data == NULL)
-               return False;
-
-       if (!prs_align(ps))
-               return False;
-       if (!prs_uint32("type", ps, depth, &data->type))
-               return False;
-
-       if ( length > sizeof(uint32) )
-               siglen = length - sizeof(uint32);       
-
-       if (UNMARSHALLING(ps) && length) {
-               if (siglen) {
-                       data->signature.buffer = PRS_ALLOC_MEM(ps, uint8, siglen);
-                       if (!data->signature.buffer) {
-                               DEBUG(3, ("No memory available\n"));
-                               return False;
-                       }
-               } else {
-                       data->signature.buffer = NULL;
-               }
+       if (!srv_sig_ptr || !srv_sig_blob) {
+               DEBUG(0,("PAC no srv_key\n"));
+               return NT_STATUS_INVALID_PARAMETER;
        }
 
-       data->signature.buf_len = siglen;
+       if (!kdc_sig_ptr || !kdc_sig_blob) {
+               DEBUG(0,("PAC no kdc_key\n"));
+               return NT_STATUS_INVALID_PARAMETER;
+       }
 
-       if (!prs_uint8s(False, "signature", ps, depth, data->signature.buffer, data->signature.buf_len))
-               return False;
+       /* Find and zero out the signatures, as required by the signing algorithm */
+
+       /* We find the data blobs above, now we parse them to get at the exact portion we should zero */
+       ndr_err = ndr_pull_struct_blob(kdc_sig_blob, kdc_sig_wipe,
+                                      NULL, kdc_sig_wipe,
+                                      (ndr_pull_flags_fn_t)ndr_pull_PAC_SIGNATURE_DATA);
+       if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
+               status = ndr_map_error2ntstatus(ndr_err);
+               DEBUG(0,("can't parse the KDC signature: %s\n",
+                       nt_errstr(status)));
+               return status;
+       }
+
+       ndr_err = ndr_pull_struct_blob(srv_sig_blob, srv_sig_wipe,
+                                      NULL, srv_sig_wipe,
+                                      (ndr_pull_flags_fn_t)ndr_pull_PAC_SIGNATURE_DATA);
+       if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
+               status = ndr_map_error2ntstatus(ndr_err);
+               DEBUG(0,("can't parse the SRV signature: %s\n",
+                       nt_errstr(status)));
+               return status;
+       }
+
+       /* Now zero the decoded structure */
+       memset(kdc_sig_wipe->signature.data, '\0', kdc_sig_wipe->signature.length);
+       memset(srv_sig_wipe->signature.data, '\0', srv_sig_wipe->signature.length);
+
+       /* and reencode, back into the same place it came from */
+       ndr_err = ndr_push_struct_blob(kdc_sig_blob, pac_data_raw,
+                                      NULL, kdc_sig_wipe,
+                                      (ndr_push_flags_fn_t)ndr_push_PAC_SIGNATURE_DATA);
+       if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
+               status = ndr_map_error2ntstatus(ndr_err);
+               DEBUG(0,("can't repack the KDC signature: %s\n",
+                       nt_errstr(status)));
+               return status;
+       }
+       ndr_err = ndr_push_struct_blob(srv_sig_blob, pac_data_raw,
+                                      NULL, srv_sig_wipe,
+                                      (ndr_push_flags_fn_t)ndr_push_PAC_SIGNATURE_DATA);
+       if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
+               status = ndr_map_error2ntstatus(ndr_err);
+               DEBUG(0,("can't repack the SRV signature: %s\n",
+                       nt_errstr(status)));
+               return status;
+       }
+
+       /* push out the whole structure, but now with zero'ed signatures */
+       ndr_err = ndr_push_struct_blob(&modified_pac_blob, pac_data_raw,
+                                      NULL, pac_data_raw,
+                                      (ndr_push_flags_fn_t)ndr_push_PAC_DATA_RAW);
+       if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
+               status = ndr_map_error2ntstatus(ndr_err);
+               DEBUG(0,("can't repack the RAW PAC: %s\n",
+                       nt_errstr(status)));
+               return status;
+       }
+
+       /* verify by service_key */
+       ret = check_pac_checksum(mem_ctx,
+                                modified_pac_blob, srv_sig_ptr,
+                                context,
+                                service_keyblock);
+       if (ret) {
+               DEBUG(1, ("PAC Decode: Failed to verify the service signature: %s\n",
+                         error_message(ret)));
+               return NT_STATUS_ACCESS_DENIED;
+       }
 
+       /* Convert to NT time, so as not to loose accuracy in comparison */
+       unix_to_nt_time(&tgs_authtime_nttime, tgs_authtime);
 
-       return True;
-}
+       if (tgs_authtime_nttime != logon_name->logon_time) {
+               DEBUG(2, ("PAC Decode: Logon time mismatch between ticket and PAC!\n"));
+               DEBUG(2, ("PAC Decode: PAC: %s\n", nt_time_string(mem_ctx, logon_name->logon_time)));
+               DEBUG(2, ("PAC Decode: Ticket: %s\n", nt_time_string(mem_ctx, tgs_authtime_nttime)));
+               return NT_STATUS_ACCESS_DENIED;
+       }
 
-static BOOL pac_io_pac_info_hdr_ctr(const char *desc, PAC_BUFFER *hdr,
-                                   prs_struct *ps, int depth)
-{
-       if (NULL == hdr)
-               return False;
+       ret = smb_krb5_parse_name_norealm(context, logon_name->account_name,
+                                   &client_principal_pac);
+       if (ret) {
+               DEBUG(2, ("Could not parse name from incoming PAC: [%s]: %s\n",
+                         logon_name->account_name,
+                         error_message(ret)));
+               return NT_STATUS_INVALID_PARAMETER;
+       }
 
-       prs_debug(ps, depth, desc, "pac_io_pac_info_hdr_ctr");
-       depth++;
+       if (!smb_krb5_principal_compare_any_realm(context, client_principal, client_principal_pac)) {
+               DEBUG(2, ("Name in PAC [%s] does not match principal name in ticket\n",
+                         logon_name->account_name));
+               krb5_free_principal(context, client_principal_pac);
+               return NT_STATUS_ACCESS_DENIED;
+       }
 
-       if (!prs_align(ps))
-               return False;
+       DEBUG(3,("Found account name from PAC: %s [%s]\n",
+                logon_info->info3.base.account_name.string,
+                logon_info->info3.base.full_name.string));
 
-       if (hdr->offset != prs_offset(ps)) {
-               DEBUG(5,("offset in header(x%x) and data(x%x) do not match, correcting\n",
-                        hdr->offset, prs_offset(ps)));
-               prs_set_offset(ps, hdr->offset);
-       }
+       DEBUG(10,("Successfully validated Kerberos PAC\n"));
 
-       if (UNMARSHALLING(ps) && hdr->size > 0) {
-               hdr->ctr = PRS_ALLOC_MEM(ps, PAC_INFO_CTR, 1);
-               if (!hdr->ctr) {
-                       DEBUG(3, ("No memory available\n"));
-                       return False;
+       if (DEBUGLEVEL >= 10) {
+               const char *s;
+               s = NDR_PRINT_STRUCT_STRING(mem_ctx, PAC_DATA, pac_data);
+               if (s) {
+                       DEBUGADD(10,("%s\n", s));
                }
        }
 
-       switch(hdr->type) {
-       case PAC_TYPE_LOGON_INFO:
-               DEBUG(5, ("PAC_TYPE_LOGON_INFO\n"));
-               if (UNMARSHALLING(ps))
-                       hdr->ctr->pac.logon_info = PRS_ALLOC_MEM(ps, PAC_LOGON_INFO, 1);
-               if (!hdr->ctr->pac.logon_info) {
-                       DEBUG(3, ("No memory available\n"));
-                       return False;
-               }
-               if (!pac_io_pac_logon_info(desc, hdr->ctr->pac.logon_info,
-                                          ps, depth))
-                       return False;
-               break;
-
-       case PAC_TYPE_SERVER_CHECKSUM:
-               DEBUG(5, ("PAC_TYPE_SERVER_CHECKSUM\n"));
-               if (UNMARSHALLING(ps))
-                       hdr->ctr->pac.srv_cksum = PRS_ALLOC_MEM(ps, PAC_SIGNATURE_DATA, 1);
-               if (!hdr->ctr->pac.srv_cksum) {
-                       DEBUG(3, ("No memory available\n"));
-                       return False;
-               }
-               if (!pac_io_pac_signature_data(desc, hdr->ctr->pac.srv_cksum,
-                                              hdr->size, ps, depth))
-                       return False;
-               break;
-
-       case PAC_TYPE_PRIVSVR_CHECKSUM:
-               DEBUG(5, ("PAC_TYPE_PRIVSVR_CHECKSUM\n"));
-               if (UNMARSHALLING(ps))
-                       hdr->ctr->pac.privsrv_cksum = PRS_ALLOC_MEM(ps, PAC_SIGNATURE_DATA, 1);
-               if (!hdr->ctr->pac.privsrv_cksum) {
-                       DEBUG(3, ("No memory available\n"));
-                       return False;
-               }
-               if (!pac_io_pac_signature_data(desc, 
-                                              hdr->ctr->pac.privsrv_cksum,
-                                              hdr->size, ps, depth))
-                       return False;
-               break;
-
-       case PAC_TYPE_LOGON_NAME:
-               DEBUG(5, ("PAC_TYPE_LOGON_NAME\n"));
-               if (UNMARSHALLING(ps))
-                       hdr->ctr->pac.logon_name = PRS_ALLOC_MEM(ps, PAC_LOGON_NAME, 1);
-               if (!hdr->ctr->pac.logon_name) {
-                       DEBUG(3, ("No memory available\n"));
-                       return False;
-               }
-               if (!pac_io_logon_name(desc, hdr->ctr->pac.logon_name,
-                                           ps, depth))
-                       return False;
-               break;
+       *pac_data_out = pac_data;
 
-       default:
-               /* dont' know, so we need to skip it */
-               DEBUG(3, ("unknown PAC type %d\n", hdr->type));
-               prs_set_offset(ps, prs_offset(ps) + hdr->size);
-       }
-
-#if 0
-       /* obscure pad */
-       if (!prs_uint32("pad", ps, depth, &hdr->pad))
-               return False;
-#endif
-       return True;
+       return NT_STATUS_OK;
 }
 
-static BOOL pac_io_pac_info_hdr(const char *desc, PAC_BUFFER *hdr, 
-                               prs_struct *ps, int depth)
-{
-       if (NULL == hdr)
-               return False;
-
-       prs_debug(ps, depth, desc, "pac_io_pac_info_hdr");
-       depth++;
-
-       if (!prs_align(ps))
-               return False;
-       if (!prs_uint32("type", ps, depth, &hdr->type))
-               return False;
-       if (!prs_uint32("size", ps, depth, &hdr->size))
-               return False;
-       if (!prs_uint32("offset", ps, depth, &hdr->offset))
-               return False;
-       if (!prs_uint32("offsethi", ps, depth, &hdr->offsethi))
-               return False;
-
-       return True;
-}
+/****************************************************************
+****************************************************************/
 
-static BOOL pac_io_pac_data(const char *desc, PAC_DATA *data, 
-                           prs_struct *ps, int depth)
+struct PAC_LOGON_INFO *get_logon_info_from_pac(struct PAC_DATA *pac_data)
 {
        int i;
 
-       if (NULL == data)
-               return False;
-
-       prs_debug(ps, depth, desc, "pac_io_pac_data");
-       depth++;
-
-       if (!prs_align(ps))
-               return False;
-       if (!prs_uint32("num_buffers", ps, depth, &data->num_buffers))
-               return False;
-       if (!prs_uint32("version", ps, depth, &data->version))
-               return False;
+       for (i=0; i < pac_data->num_buffers; i++) {
 
-       if (UNMARSHALLING(ps) && data->num_buffers > 0) {
-               if ((data->pac_buffer = PRS_ALLOC_MEM(ps, PAC_BUFFER, data->num_buffers)) == NULL) {
-                       return False;
+               if (pac_data->buffers[i].type != PAC_TYPE_LOGON_INFO) {
+                       continue;
                }
-       }
-
-       for (i=0; i<data->num_buffers; i++) {
-               if (!pac_io_pac_info_hdr(desc, &data->pac_buffer[i], ps, 
-                                        depth))
-                       return False;
-       }
 
-       for (i=0; i<data->num_buffers; i++) {
-               if (!pac_io_pac_info_hdr_ctr(desc, &data->pac_buffer[i],
-                                            ps, depth))
-                       return False;
+               return pac_data->buffers[i].info->logon_info.info;
        }
 
-       return True;
+       return NULL;
 }
 
-static NTSTATUS check_pac_checksum(TALLOC_CTX *mem_ctx, 
-                                  DATA_BLOB pac_data,
-                                  PAC_SIGNATURE_DATA *sig,
-                                  krb5_context context,
-                                  krb5_keyblock *keyblock)
+/****************************************************************
+****************************************************************/
+
+NTSTATUS kerberos_return_pac(TALLOC_CTX *mem_ctx,
+                            const char *name,
+                            const char *pass,
+                            time_t time_offset,
+                            time_t *expire_time,
+                            time_t *renew_till_time,
+                            const char *cache_name,
+                            bool request_pac,
+                            bool add_netbios_addr,
+                            time_t renewable_time,
+                            const char *impersonate_princ_s,
+                            struct PAC_DATA **pac_ret)
 {
        krb5_error_code ret;
-       krb5_checksum cksum;
-       krb5_keyusage usage = 0;
-
-       smb_krb5_checksum_from_pac_sig(&cksum, sig);
-
-#ifdef HAVE_KRB5_KU_OTHER_CKSUM /* Heimdal */
-       usage = KRB5_KU_OTHER_CKSUM;
-#elif defined(HAVE_KRB5_KEYUSAGE_APP_DATA_CKSUM) /* MIT */
-       usage = KRB5_KEYUSAGE_APP_DATA_CKSUM;
-#else
-#error UNKNOWN_KRB5_KEYUSAGE
-#endif
-
-       ret = smb_krb5_verify_checksum(context, 
-                                      keyblock, 
-                                      usage, 
-                                      &cksum,
-                                      pac_data.data, 
-                                      pac_data.length);
-
-       if (ret) {
-               DEBUG(2,("check_pac_checksum: PAC Verification failed: %s (%d)\n", 
-                       error_message(ret), ret));
-               return NT_STATUS_ACCESS_DENIED;
-       }
-
-       return NT_STATUS_OK;
-}
-
-static NTSTATUS parse_pac_data(TALLOC_CTX *mem_ctx, DATA_BLOB *pac_data_blob, PAC_DATA *pac_data)
-{
-       prs_struct ps;
-       PAC_DATA *my_pac;
-
-       if (!prs_init(&ps, pac_data_blob->length, mem_ctx, UNMARSHALL))
-               return NT_STATUS_NO_MEMORY;
-
-       if (!prs_copy_data_in(&ps, (char *)pac_data_blob->data, pac_data_blob->length))
+       NTSTATUS status = NT_STATUS_INVALID_PARAMETER;
+       DATA_BLOB tkt, ap_rep, sesskey1, sesskey2;
+       struct PAC_DATA *pac_data = NULL;
+       char *client_princ_out = NULL;
+       const char *auth_princ = NULL;
+       const char *local_service = NULL;
+       const char *cc = "MEMORY:kerberos_return_pac";
+
+       ZERO_STRUCT(tkt);
+       ZERO_STRUCT(ap_rep);
+       ZERO_STRUCT(sesskey1);
+       ZERO_STRUCT(sesskey2);
+
+       if (!name || !pass) {
                return NT_STATUS_INVALID_PARAMETER;
-
-       prs_set_offset(&ps, 0);
-
-       my_pac = TALLOC_ZERO_P(mem_ctx, PAC_DATA);
-       if (!pac_io_pac_data("pac data", my_pac, &ps, 0))
-               return NT_STATUS_INVALID_PARAMETER;
-
-       prs_mem_free(&ps);
-
-       *pac_data = *my_pac;
-
-       return NT_STATUS_OK;
-}
-
-/* just for debugging, will be removed later - Guenther */
-char *pac_group_attr_string(uint32 attr)
-{
-       fstring name = "";
-
-       if (!attr)
-               return NULL;
-
-       if (attr & SE_GROUP_MANDATORY)                  fstrcat(name, "SE_GROUP_MANDATORY ");
-       if (attr & SE_GROUP_ENABLED_BY_DEFAULT)         fstrcat(name, "SE_GROUP_ENABLED_BY_DEFAULT ");
-       if (attr & SE_GROUP_ENABLED)                    fstrcat(name, "SE_GROUP_ENABLED ");
-       if (attr & SE_GROUP_OWNER)                      fstrcat(name, "SE_GROUP_OWNER ");
-       if (attr & SE_GROUP_USE_FOR_DENY_ONLY)          fstrcat(name, "SE_GROUP_USE_FOR_DENY_ONLY ");
-       if (attr & SE_GROUP_LOGON_ID)                   fstrcat(name, "SE_GROUP_LOGON_ID ");
-       if (attr & SE_GROUP_RESOURCE)                   fstrcat(name, "SE_GROUP_RESOURCE ");
-
-       return SMB_STRDUP(name);
-}
-
-/* just for debugging, will be removed later - Guenther */
-static void dump_pac_logon_info(PAC_LOGON_INFO *logon_info) {
-
-       DOM_SID dom_sid, res_group_dom_sid;
-       int i;
-       char *attr_string;
-       uint32 user_flgs = logon_info->info3.user_flgs;
-
-       if (logon_info->info3.ptr_res_group_dom_sid) {
-               sid_copy(&res_group_dom_sid, &logon_info->res_group_dom_sid.sid);
-       }
-       sid_copy(&dom_sid, &logon_info->info3.dom_sid.sid);
-       
-       DEBUG(10,("The PAC:\n"));
-       
-       DEBUGADD(10,("\tUser Flags: 0x%x (%d)\n", user_flgs, user_flgs));
-       if (user_flgs & LOGON_EXTRA_SIDS)
-               DEBUGADD(10,("\tUser Flags: LOGON_EXTRA_SIDS 0x%x (%d)\n", LOGON_EXTRA_SIDS, LOGON_EXTRA_SIDS));
-       if (user_flgs & LOGON_RESOURCE_GROUPS)
-               DEBUGADD(10,("\tUser Flags: LOGON_RESOURCE_GROUPS 0x%x (%d)\n", LOGON_RESOURCE_GROUPS, LOGON_RESOURCE_GROUPS));
-       DEBUGADD(10,("\tUser SID: %s-%d\n", sid_string_static(&dom_sid), logon_info->info3.user_rid));
-       DEBUGADD(10,("\tGroup SID: %s-%d\n", sid_string_static(&dom_sid), logon_info->info3.group_rid));
-
-       DEBUGADD(10,("\tGroup Membership (Global and Universal Groups of own domain):\n"));
-       for (i = 0; i < logon_info->info3.num_groups; i++) {
-               attr_string = pac_group_attr_string(logon_info->info3.gids[i].attr);
-               DEBUGADD(10,("\t\t%d: sid: %s-%d\n\t\t   attr: 0x%x == %s\n", 
-                       i, sid_string_static(&dom_sid), 
-                       logon_info->info3.gids[i].g_rid,
-                       logon_info->info3.gids[i].attr,
-                       attr_string));
-               SAFE_FREE(attr_string);
-       }
-
-       DEBUGADD(10,("\tGroup Membership (Domain Local Groups and Groups from Trusted Domains):\n"));
-       for (i = 0; i < logon_info->info3.num_other_sids; i++) {
-               attr_string = pac_group_attr_string(logon_info->info3.other_sids_attrib[i]);
-               DEBUGADD(10,("\t\t%d: sid: %s\n\t\t   attr: 0x%x == %s\n", 
-                       i, sid_string_static(&logon_info->info3.other_sids[i].sid), 
-                       logon_info->info3.other_sids_attrib[i],
-                       attr_string));
-               SAFE_FREE(attr_string);
-       }
-
-       DEBUGADD(10,("\tGroup Membership (Ressource Groups (SID History ?)):\n"));
-       for (i = 0; i < logon_info->info3.res_group_count; i++) {
-               attr_string = pac_group_attr_string(logon_info->res_groups.group_membership[i].attrs);
-               DEBUGADD(10,("\t\t%d: sid: %s-%d\n\t\t   attr: 0x%x == %s\n", 
-                       i, sid_string_static(&res_group_dom_sid),
-                       logon_info->res_groups.group_membership[i].rid,
-                       logon_info->res_groups.group_membership[i].attrs,
-                       attr_string));
-               SAFE_FREE(attr_string);
        }
-}
 
- NTSTATUS decode_pac_data(TALLOC_CTX *mem_ctx,
-                        DATA_BLOB *pac_data_blob,
-                        krb5_context context, 
-                        krb5_keyblock *service_keyblock,
-                        krb5_const_principal client_principal,
-                        time_t tgs_authtime,
-                        PAC_DATA **pac_data)
-                        
-{
-       DATA_BLOB modified_pac_blob;
-       PAC_DATA *my_pac;
-       NTSTATUS nt_status;
-       krb5_error_code ret;
-       PAC_SIGNATURE_DATA *srv_sig = NULL;
-       PAC_SIGNATURE_DATA *kdc_sig = NULL;
-       PAC_LOGON_NAME *logon_name = NULL;
-       PAC_LOGON_INFO *logon_info = NULL;
-       krb5_principal client_principal_pac = NULL;
-       NTTIME tgs_authtime_nttime;
-       int i, srv_sig_pos = 0, kdc_sig_pos = 0;
-       fstring username;
-
-       *pac_data = NULL;
-
-       my_pac = talloc(mem_ctx, PAC_DATA);
-       if (!my_pac) {
-               return NT_STATUS_NO_MEMORY;
+       if (cache_name) {
+               cc = cache_name;
        }
 
-       nt_status = parse_pac_data(mem_ctx, pac_data_blob, my_pac);
-       if (!NT_STATUS_IS_OK(nt_status)) {
-               DEBUG(0,("decode_pac_data: failed to parse PAC\n"));
-               return nt_status;
+       if (!strchr_m(name, '@')) {
+               auth_princ = talloc_asprintf(mem_ctx, "%s@%s", name,
+                       lp_realm());
+       } else {
+               auth_princ = name;
        }
+       NT_STATUS_HAVE_NO_MEMORY(auth_princ);
 
-       modified_pac_blob = data_blob_talloc(mem_ctx, pac_data_blob->data, pac_data_blob->length);
+       local_service = talloc_asprintf(mem_ctx, "%s$@%s",
+                                       global_myname(), lp_realm());
+       NT_STATUS_HAVE_NO_MEMORY(local_service);
 
-       if (my_pac->num_buffers < 4) {
-               nt_status = NT_STATUS_INVALID_PARAMETER;
+       ret = kerberos_kinit_password_ext(auth_princ,
+                                         pass,
+                                         time_offset,
+                                         expire_time,
+                                         renew_till_time,
+                                         cc,
+                                         request_pac,
+                                         add_netbios_addr,
+                                         renewable_time,
+                                         &status);
+       if (ret) {
+               DEBUG(1,("kinit failed for '%s' with: %s (%d)\n",
+                       auth_princ, error_message(ret), ret));
+               /* status already set */
                goto out;
        }
 
-       /* store signatures */
-       for (i=0; i < my_pac->num_buffers; i++) {
-       
-               switch (my_pac->pac_buffer[i].type) {
-               
-                       case PAC_TYPE_SERVER_CHECKSUM:
-                               if (!my_pac->pac_buffer[i].ctr->pac.srv_cksum) {
-                                       break;
-                               }
-                               
-                               srv_sig = my_pac->pac_buffer[i].ctr->pac.srv_cksum;
-                               
-                               /* get position of signature buffer */
-                               srv_sig_pos = my_pac->pac_buffer[i].offset;
-                               srv_sig_pos += sizeof(uint32);
-                               
-                               break;
-                               
-                       case PAC_TYPE_PRIVSVR_CHECKSUM:
-                               if (!my_pac->pac_buffer[i].ctr->pac.privsrv_cksum) {
-                                       break;
-                               }
-
-                               kdc_sig = my_pac->pac_buffer[i].ctr->pac.privsrv_cksum;
-                               
-                               /* get position of signature buffer */
-                               kdc_sig_pos = my_pac->pac_buffer[i].offset;
-                               kdc_sig_pos += sizeof(uint32);
-                               
-                               break;
-                               
-                       case PAC_TYPE_LOGON_NAME:
-                               if (!my_pac->pac_buffer[i].ctr->pac.logon_name) {
-                                       break;
-                               }
-
-                               logon_name = my_pac->pac_buffer[i].ctr->pac.logon_name;
-                               break;
-
-                       case PAC_TYPE_LOGON_INFO:
-                               if (!my_pac->pac_buffer[i].ctr->pac.logon_info) {
-                                       break;
-                               }
-
-                               logon_info = my_pac->pac_buffer[i].ctr->pac.logon_info;
-                               break;
-                       }
-
+       DEBUG(10,("got TGT for %s in %s\n", auth_princ, cc));
+       if (expire_time) {
+               DEBUGADD(10,("\tvalid until: %s (%d)\n",
+                       http_timestring(talloc_tos(), *expire_time),
+                       (int)*expire_time));
        }
-
-       if (!srv_sig || !kdc_sig || !logon_name || !logon_info) {
-               nt_status = NT_STATUS_INVALID_PARAMETER;
-               goto out;
+       if (renew_till_time) {
+               DEBUGADD(10,("\trenewable till: %s (%d)\n",
+                       http_timestring(talloc_tos(), *renew_till_time),
+                       (int)*renew_till_time));
        }
 
-       /* zero PAC_SIGNATURE_DATA signature buffer */
-       memset(&modified_pac_blob.data[srv_sig_pos], '\0', srv_sig->signature.buf_len);
-       memset(&modified_pac_blob.data[kdc_sig_pos], '\0', kdc_sig->signature.buf_len);
+       /* we cannot continue with krb5 when UF_DONT_REQUIRE_PREAUTH is set,
+        * in that case fallback to NTLM - gd */
 
-       /* check server signature */
-       nt_status = check_pac_checksum(mem_ctx, modified_pac_blob, srv_sig, context, service_keyblock);
-       if (!NT_STATUS_IS_OK(nt_status)) {
-               DEBUG(0,("decode_pac_data: failed to verify PAC server signature\n"));
-               goto out;
+       if (expire_time && renew_till_time &&
+           (*expire_time == 0) && (*renew_till_time == 0)) {
+               return NT_STATUS_INVALID_LOGON_TYPE;
        }
 
-       /* Convert to NT time, so as not to loose accuracy in comparison */
-       unix_to_nt_time(&tgs_authtime_nttime, tgs_authtime);
-
-       if (!nt_time_equals(&tgs_authtime_nttime, &logon_name->logon_time)) {
-       
-               DEBUG(2,("decode_pac_data: Logon time mismatch between ticket and PAC!\n"));
-               DEBUGADD(2, ("decode_pac_data: PAC: %s\n", 
-                       http_timestring(nt_time_to_unix(logon_name->logon_time))));
-               DEBUGADD(2, ("decode_pac_data: Ticket: %s\n", 
-                       http_timestring(nt_time_to_unix(tgs_authtime_nttime))));
-               
-               nt_status = NT_STATUS_ACCESS_DENIED;
+       ret = cli_krb5_get_ticket(local_service,
+                                 time_offset,
+                                 &tkt,
+                                 &sesskey1,
+                                 0,
+                                 cc,
+                                 NULL,
+                                 impersonate_princ_s);
+       if (ret) {
+               DEBUG(1,("failed to get ticket for %s: %s\n",
+                       local_service, error_message(ret)));
+               if (impersonate_princ_s) {
+                       DEBUGADD(1,("tried S4U2SELF impersonation as: %s\n",
+                               impersonate_princ_s));
+               }
+               status = krb5_to_nt_status(ret);
                goto out;
        }
-
-       if (!logon_name->len) {
-               DEBUG(2,("decode_pac_data: No Logon Name available\n"));
-               nt_status = NT_STATUS_INVALID_PARAMETER;
+       status = ads_verify_ticket(mem_ctx,
+                                  lp_realm(),
+                                  time_offset,
+                                  &tkt,
+                                  &client_princ_out,
+                                  &pac_data,
+                                  &ap_rep,
+                                  &sesskey2,
+                                  False);
+       if (!NT_STATUS_IS_OK(status)) {
+               DEBUG(1,("ads_verify_ticket failed: %s\n",
+                       nt_errstr(status)));
                goto out;
        }
-       rpcstr_pull(username, logon_name->username, sizeof(username), logon_name->len, 0);
 
-       ret = smb_krb5_parse_name_norealm(context, username, &client_principal_pac);
-       if (ret) {
-               DEBUG(2,("decode_pac_data: Could not parse name from incoming PAC: [%s]: %s\n", 
-                       username, error_message(ret)));
-               nt_status = NT_STATUS_INVALID_PARAMETER;
+       if (!pac_data) {
+               DEBUG(1,("no PAC\n"));
+               status = NT_STATUS_INVALID_PARAMETER;
                goto out;
        }
 
-       if (!smb_krb5_principal_compare_any_realm(context, client_principal, client_principal_pac)) {
-               DEBUG(2,("decode_pac_data: Name in PAC [%s] does not match principal name in ticket\n", 
-                       username));
-               nt_status = NT_STATUS_ACCESS_DENIED;
-               goto out;
+       *pac_ret = pac_data;
+
+out:
+       if (cc != cache_name) {
+               ads_kdestroy(cc);
        }
 
-       DEBUG(10,("Successfully validated Kerberos PAC\n"));
+       data_blob_free(&tkt);
+       data_blob_free(&ap_rep);
+       data_blob_free(&sesskey1);
+       data_blob_free(&sesskey2);
 
-       dump_pac_logon_info(logon_info);
+       TALLOC_FREE(client_princ_out);
 
-       *pac_data = my_pac;
+       return status;
+}
 
-       nt_status = NT_STATUS_OK;
+/****************************************************************
+****************************************************************/
+
+static NTSTATUS kerberos_return_pac_logon_info(TALLOC_CTX *mem_ctx,
+                                              const char *name,
+                                              const char *pass,
+                                              time_t time_offset,
+                                              time_t *expire_time,
+                                              time_t *renew_till_time,
+                                              const char *cache_name,
+                                              bool request_pac,
+                                              bool add_netbios_addr,
+                                              time_t renewable_time,
+                                              const char *impersonate_princ_s,
+                                              struct PAC_LOGON_INFO **logon_info)
+{
+       NTSTATUS status;
+       struct PAC_DATA *pac_data = NULL;
+       struct PAC_LOGON_INFO *info = NULL;
 
-out:
-       if (client_principal_pac) {
-               krb5_free_principal(context, client_principal_pac);
+       status = kerberos_return_pac(mem_ctx,
+                                    name,
+                                    pass,
+                                    time_offset,
+                                    expire_time,
+                                    renew_till_time,
+                                    cache_name,
+                                    request_pac,
+                                    add_netbios_addr,
+                                    renewable_time,
+                                    impersonate_princ_s,
+                                    &pac_data);
+       if (!NT_STATUS_IS_OK(status)) {
+               return status;
        }
 
-       return nt_status;
-}
+       if (!pac_data) {
+               DEBUG(3,("no pac\n"));
+               return NT_STATUS_INVALID_USER_BUFFER;
+       }
 
- PAC_LOGON_INFO *get_logon_info_from_pac(PAC_DATA *pac_data) 
-{
-       PAC_LOGON_INFO *logon_info = NULL;
-       int i;
-       
-       for (i=0; i < pac_data->num_buffers; i++) {
+       info = get_logon_info_from_pac(pac_data);
+       if (!info) {
+               DEBUG(1,("no logon_info\n"));
+               return NT_STATUS_INVALID_USER_BUFFER;
+       }
 
-               if (pac_data->pac_buffer[i].type != PAC_TYPE_LOGON_INFO)
-                       continue;
+       *logon_info = info;
 
-               logon_info = pac_data->pac_buffer[i].ctr->pac.logon_info;
-               break;
-       }
-       return logon_info;
+       return NT_STATUS_OK;
 }
 
+/****************************************************************
+****************************************************************/
+
+NTSTATUS kerberos_return_info3_from_pac(TALLOC_CTX *mem_ctx,
+                                       const char *name,
+                                       const char *pass,
+                                       time_t time_offset,
+                                       time_t *expire_time,
+                                       time_t *renew_till_time,
+                                       const char *cache_name,
+                                       bool request_pac,
+                                       bool add_netbios_addr,
+                                       time_t renewable_time,
+                                       const char *impersonate_princ_s,
+                                       struct netr_SamInfo3 **info3)
+{
+       NTSTATUS status;
+       struct PAC_LOGON_INFO *logon_info = NULL;
+
+       status = kerberos_return_pac_logon_info(mem_ctx,
+                                               name,
+                                               pass,
+                                               time_offset,
+                                               expire_time,
+                                               renew_till_time,
+                                               cache_name,
+                                               request_pac,
+                                               add_netbios_addr,
+                                               renewable_time,
+                                               impersonate_princ_s,
+                                               &logon_info);
+       if (!NT_STATUS_IS_OK(status)) {
+               return status;
+       }
+
+       *info3 = &logon_info->info3;
+
+       return NT_STATUS_OK;
+}
 #endif