From 27d7939d74392459741c6c99690b74f193c269c7 Mon Sep 17 00:00:00 2001
From: Nicolas Williams <nico@twosigma.com>
Date: Tue, 6 Dec 2016 21:14:38 -0600
Subject: [PATCH] Improve valgrind suppressions

---
 cf/valgrind-suppressions | 60 +++++++++++++++++++++++++---------------
 1 file changed, 37 insertions(+), 23 deletions(-)

diff --git a/cf/valgrind-suppressions b/cf/valgrind-suppressions
index f61050958..44f3f379e 100644
--- a/cf/valgrind-suppressions
+++ b/cf/valgrind-suppressions
@@ -84,7 +84,6 @@
 {
    glibc sed leak 1
    Memcheck:Leak
-   match-leak-kinds: definite
    fun:calloc
    obj:/bin/sed
    obj:/bin/sed
@@ -96,37 +95,19 @@
 {
    Heimdal one-time init leak 1
    Memcheck:Leak
-   match-leak-kinds: possible
-   fun:malloc
-   fun:heim_dict_set_value
-   fun:_krb5_load_plugins
-   fun:init_context_once
-   fun:once_callback_caller
-   fun:pthread_once
+   ...
    fun:heim_base_once_f
-   fun:krb5_init_context
-   fun:main
+   ...
 }
 {
    Heimdal one-time init leak 2
    Memcheck:Leak
-   match-leak-kinds: possible
-   fun:calloc
-   fun:_heim_alloc_object
-   fun:heim_string_create_with_bytes
-   fun:heim_string_create
-   fun:_krb5_load_plugins
-   fun:init_context_once
-   fun:once_callback_caller
    fun:pthread_once
-   fun:heim_base_once_f
-   fun:krb5_init_context
-   fun:main
+   ...
 }
 {
    Heimdal one-time init leak 3
    Memcheck:Leak
-   match-leak-kinds: possible
    fun:calloc
    fun:_heim_alloc_object
    fun:heim_dict_create
@@ -141,7 +122,6 @@
 {
    Heimdal one-time init leak 4
    Memcheck:Leak
-   match-leak-kinds: possible
    fun:calloc
    fun:heim_dict_create
    fun:_krb5_load_plugins
@@ -152,3 +132,37 @@
    fun:krb5_init_context
    fun:main
 }
+{
+   Heimdal ipropd-master leak 1
+   Memcheck:Leak
+   ...
+   fun:krb5_kt_resolve
+   fun:main
+   obj:*ipropd-master
+}
+{
+   Heimdal ipropd-master leak 2
+   Memcheck:Leak
+   ...
+   fun:kadm5_init_with_skey_ctx
+   fun:main
+   obj:*ipropd-master
+}
+{
+   Heimdal ipropd-slave leak 1
+   Memcheck:Leak
+   ...
+   fun:krb5_auth_con_init
+   ...
+   fun:krb5_sendauth
+   fun:main
+   obj:*ipropd-slave
+}
+{
+   Heimdal ipropd-slave leak 2
+   Memcheck:Leak
+   ...
+   fun:kadm5_init_with_password_ctx
+   fun:main
+   obj:*ipropd-slave
+}