From: Tom Yu Date: Thu, 16 Dec 2004 21:25:14 +0000 (+0000) Subject: pullup from trunk X-Git-Tag: krb5-1.4.3-beta1~137 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=3e2ea0bd8760abc511ffdce5e517ebf38c6db823;p=krb5.git pullup from trunk ticket: 2818 version_fixed: 1.4 git-svn-id: svn://anonsvn.mit.edu/krb5/branches/krb5-1-4@16946 dc483132-0cff-0310-8789-dd5450dbe970 --- diff --git a/src/lib/krb5/ccache/ChangeLog b/src/lib/krb5/ccache/ChangeLog index 14b585c01..10c5bca51 100644 --- a/src/lib/krb5/ccache/ChangeLog +++ b/src/lib/krb5/ccache/ChangeLog @@ -5,6 +5,11 @@ - Activate support for KerbQueryTicketCacheEx2Message - Add locale support for regions which use MultiByte characters +2004-11-19 Ken Raeburn + + * cc_mslsa.c (MSCredToMITCred): Don't create an empty array for + addresses, just use a null pointer now. + 2004-10-07 Jeffrey Altman * cc_mslsa.c: Fix the forced setting of the Initial Ticket Flag on Win2000 and add it to XP and 2003 SP1 diff --git a/src/lib/krb5/ccache/cc_mslsa.c b/src/lib/krb5/ccache/cc_mslsa.c index d1d895950..b0aa4d0ad 100644 --- a/src/lib/krb5/ccache/cc_mslsa.c +++ b/src/lib/krb5/ccache/cc_mslsa.c @@ -418,12 +418,7 @@ MSCredToMITCred(KERB_EXTERNAL_TICKET *msticket, UNICODE_STRING ClientRealm, creds->times.starttime=FileTimeToUnixTime(&msticket->StartTime); creds->times.endtime=FileTimeToUnixTime(&msticket->EndTime); creds->times.renew_till=FileTimeToUnixTime(&msticket->RenewUntil); - - /* MS Tickets are addressless. MIT requires an empty address - * not a NULL list of addresses. - */ - creds->addresses = (krb5_address **)malloc(sizeof(krb5_address *)); - memset(creds->addresses, 0, sizeof(krb5_address *)); + creds->addresses = NULL; MSTicketToMITTicket(msticket, context, &creds->ticket); return TRUE;