[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha6-411-gaf73692

[Steven Danneman]

The branch, master has been updated
       via  af736923a541df1a37afeb72b8a5652932c4c69c (commit)
      from  cfc27ece109fcc63016ad58c5f584b5459f57945 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit af736923a541df1a37afeb72b8a5652932c4c69c
Author: Björn Jacke <b...@sernet.de>
Date:   Mon Feb 2 13:06:36 2009 +0100

    fix for commit d96248a9b46 which broke Heimdal builds

-----------------------------------------------------------------------

Summary of changes:
 source3/libads/kerberos_verify.c |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/libads/kerberos_verify.c b/source3/libads/kerberos_verify.c
index 4483d2b..ec897ad 100644
--- a/source3/libads/kerberos_verify.c
+++ b/source3/libads/kerberos_verify.c
@@ -72,9 +72,15 @@ static bool ads_dedicated_keytab_verify_ticket(krb5_context 
context,
        }
 
        /* Get the key for checking the pac signature */
+#ifdef HAVE_ETYPE_IN_ENCRYPTEDDATA /* Heimdal */
+       ret = krb5_kt_get_entry(context, keytab, dec_ticket->server,
+           dec_ticket.enc_part.kvno, dec_ticket.enc_part.etype,
+           &kt_entry);
+#else /* MIT */
        ret = krb5_kt_get_entry(context, keytab, dec_ticket->server,
            dec_ticket->enc_part.kvno, dec_ticket->enc_part.enctype,
            &kt_entry);
+#endif
        if (ret) {
                DEBUG(0, ("krb5_kt_get_entry failed (%s)\n",
                          error_message(ret)));


-- 
Samba Shared Repository