From: Tom Yu Date: Tue, 24 Jun 2003 02:29:47 +0000 (+0000) Subject: apply patch from jaltman: X-Git-Tag: krb5-1.4-beta1~836 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=aaeeeefe2c6fa2ecc9a40756965c58fe39b839b6;p=krb5.git apply patch from jaltman: * ms2mit.c: Windows Credentials are addressless. Do not store the credentials in the MIT cache with addresses since they do not contain addresses in the encrypted portion of the credential. Instead generate a valid empty address list. ticket: 1618 tags: pullup git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@15648 dc483132-0cff-0310-8789-dd5450dbe970 --- diff --git a/src/windows/ms2mit/ChangeLog b/src/windows/ms2mit/ChangeLog index b68c646d3..8741abbc0 100644 --- a/src/windows/ms2mit/ChangeLog +++ b/src/windows/ms2mit/ChangeLog @@ -1,3 +1,10 @@ +2003-06-20 Jeffrey Altman + + * ms2mit.c: Windows Credentials are addressless. Do not store the + credentials in the MIT cache with addresses since they do not + contain addresses in the encrypted portion of the credential. + Instead generate a valid empty address list. + 2002-08-29 Ken Raeburn * Makefile.in: Revert $(S)=>/ change, for Windows support. diff --git a/src/windows/ms2mit/ms2mit.c b/src/windows/ms2mit/ms2mit.c index 4ec6941ad..c2d1d384e 100644 --- a/src/windows/ms2mit/ms2mit.c +++ b/src/windows/ms2mit/ms2mit.c @@ -264,11 +264,11 @@ MSCredToMITCred( creds->times.endtime=FileTimeToUnixTime(&msticket->EndTime); creds->times.renew_till=FileTimeToUnixTime(&msticket->RenewUntil); - // krb5_cc_store_cred crashes downstream if creds->addresses is NULL. - // unfortunately, the MS interface doesn't seem to return a list of - // addresses as part of the credentials information. for now i'll just - // use krb5_os_localaddr to mock up the address list. is this sufficient? - krb5_os_localaddr(context, &creds->addresses); + /* 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 *)); MSTicketToMITTicket(msticket, context, &creds->ticket); }