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 14b585c014fdc42f8f7eebb1085ddf54dd3e0ad6..10c5bca51e11aec847ee2f259f8b316fcd4cc173 100644 (file)
--- 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  <raeburn@mit.edu>
+
+       * cc_mslsa.c (MSCredToMITCred): Don't create an empty array for
+       addresses, just use a null pointer now.
+
 2004-10-07  Jeffrey Altman <jaltman@mit.edu>
         * 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 d1d895950690a782f82697599eecb7bd0349b164..b0aa4d0ad18d967a906bd5b212ddb96aab8cb013 100644 (file)
--- 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;