Changeset 989 for vendor/current/source4/heimdal

Timestamp:

Nov 25, 2016, 8:04:54 PM (9 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: update vendor to version 4.4.7

Location:

vendor/current/source4/heimdal

Files:

• kdc/misc.c (modified) (1 diff)
• lib/asn1/krb5.asn1 (modified) (1 diff)
• lib/krb5/mcache.c (modified) (4 diffs)

vendor/current/source4/heimdal/kdc/misc.c

@@ -41 +41 @@
               krb5_const_principal principal,
               unsigned flags,
-              krb5uint32 *kvno_ptr,
+              krb5int32 *kvno_ptr,
               HDB **db,
               hdb_entry_ex **h)

vendor/current/source4/heimdal/lib/asn1/krb5.asn1

@@ -361 +361 @@
 EncryptedData ::= SEQUENCE {
         etype[0]                ENCTYPE, -- EncryptionType
-        kvno[1]                 krb5uint32 OPTIONAL,
+        kvno[1]                 krb5int32 OPTIONAL,
         cipher[2]               OCTET STRING -- ciphertext
 }

vendor/current/source4/heimdal/lib/krb5/mcache.c

@@ -156 +156 @@
 }
 
+static void KRB5_CALLCONV
+mcc_destroy_internal(krb5_context context,
+                     krb5_mcache *m)
+{
+    struct link *l;
+
+    if (m->primary_principal != NULL) {
+        krb5_free_principal (context, m->primary_principal);
+        m->primary_principal = NULL;
+    }
+    m->dead = 1;
+
+    l = m->creds;
+    while (l != NULL) {
+        struct link *old;
+
+        krb5_free_cred_contents (context, &l->cred);
+        old = l;
+        l = l->next;
+        free (old);
+    }
+
+    m->creds = NULL;
+    return;
+}
+
 static krb5_error_code KRB5_CALLCONV
 mcc_initialize(krb5_context context,
@@ -162 +188 @@
 {
     krb5_mcache *m = MCACHE(id);
+    /*
+     * It's important to destroy any existing
+     * creds here, that matches the baheviour
+     * of all other backends and also the
+     * MEMORY: backend in MIT.
+     */
+    mcc_destroy_internal(context, m);
     m->dead = 0;
+    m->kdc_offset = 0;
     m->mtime = time(NULL);
     return krb5_copy_principal (context,
@@ -196 +230 @@
 {
     krb5_mcache **n, *m = MCACHE(id);
-    struct link *l;
 
     if (m->refcnt == 0)
@@ -212 +245 @@
         }
         HEIMDAL_MUTEX_unlock(&mcc_mutex);
-        if (m->primary_principal != NULL) {
-            krb5_free_principal (context, m->primary_principal);
-            m->primary_principal = NULL;
-        }
-        m->dead = 1;
-
-        l = m->creds;
-        while (l != NULL) {
-            struct link *old;
-
-            krb5_free_cred_contents (context, &l->cred);
-            old = l;
-            l = l->next;
-            free (old);
-        }
-        m->creds = NULL;
+        mcc_destroy_internal(context, m);
     }
     return 0;