- more suppressions

2 files changed, 272 insertions, 171 deletions

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 2d5db14..f2d7638 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,5 +1,5 @@
 SUBDIRS = clients
-EXTRA_DIST = run-tests.sh test*/*.ldif test*/*.sh test*/*.txt config/slapd-collations.conf config/userRoot.ldif config/schema
+EXTRA_DIST = run-tests.sh test*/*.ldif test*/*.sh test*/*.txt config/slapd-collations.conf config/userRoot.ldif config/schema *.supp
 if CAN_TEST
 check:
 	@true
diff --git a/tests/slapi-nis.supp b/tests/slapi-nis.supp
index 3db223b..f9cbb61 100644
--- a/tests/slapi-nis.supp
+++ b/tests/slapi-nis.supp
@@ -2,22 +2,39 @@
 {
    dirsrv_frontend_config
    Memcheck:Leak
-   fun:malloc
-   fun:strdup
+   ...
    fun:slapi_ch_strdup
    fun:FrontendConfig_init
    fun:main
 }
 {
+   dirsrv_frontend_config_2
+   Memcheck:Leak
+   ...
+   fun:PL_*HashTable*
+   fun:FrontendConfig_init
+   fun:main
+}
+{
+   dirsrv_frontend_config_3
+   Memcheck:Leak
+   ...
+   fun:charray_add
+   fun:FrontendConfig_init
+   fun:main
+}
+{
+   dirsrv_frontend_config_4
+   Memcheck:Leak
+   ...
+   fun:rwl_new
+   fun:FrontendConfig_init
+   fun:main
+}
+{
    dirsrv_dse_avl_init
    Memcheck:Leak
-   fun:malloc
-   fun:strdup
-   fun:slapi_ch_strdup
-   fun:slapi_sdn_get_ndn
-   fun:slapi_sdn_compare
-   fun:entry_dn_cmp
-   fun:ravl_insert.clone.0
+   ...
    fun:avl_insert
    fun:dse_add_entry_pb
    fun:dse_read_one_file
@@ -28,12 +45,7 @@
 {
    dirsrv_ldbm_logdir
    Memcheck:Leak
-   fun:malloc
-   fun:strdup
-   fun:slapi_ch_strdup
-   fun:ldbm_config_db_logdirectory_set
-   fun:ldbm_config_set
-   fun:ldbm_config_setup_default
+   ...
    fun:ldbm_back_init
    fun:plugin_setup
    fun:load_plugin_entry
@@ -44,237 +56,326 @@
    fun:main
 }
 {
-   dirsrv_ldbm_homedir
+   dirsrv_setup_internal_backends
    Memcheck:Leak
-   fun:malloc
-   fun:strdup
-   fun:slapi_ch_strdup
-   fun:ldbm_config_db_home_directory_set
-   fun:ldbm_config_set
-   fun:ldbm_config_setup_default
-   fun:ldbm_back_init
-   fun:plugin_setup
-   fun:load_plugin_entry
-   fun:dse_call_callback.clone.3
-   fun:dse_read_one_file
-   fun:dse_read_file
+   ...
    fun:setup_internal_backends
    fun:main
 }
 {
-   dirsrv_setup_backends
+   dirsrv_nspr_1
    Memcheck:Leak
-   fun:malloc
-   fun:strdup
-   fun:slapi_ch_strdup
-   fun:slapi_sdn_set_dn_byval
-   fun:slapi_sdn_new_dn_byval
-   fun:slapi_sdn_dup
-   fun:dse_register_callback
-   fun:setup_internal_backends
+   ...
+   fun:_PR_InitStuff
    fun:main
 }
 {
-   dirsrv_setup_internal_mapping_tree
+   dirsrv_nspr_2
    Memcheck:Leak
-   fun:malloc
-   fun:strdup
-   fun:slapi_ch_strdup
-   fun:slapi_sdn_set_dn_byval
-   fun:slapi_sdn_new_dn_byval
-   fun:add_internal_mapping_tree_node
-   fun:mapping_tree_init
-   fun:slapi_mapping_tree_select
-   fun:op_shared_add
-   fun:add_internal_pb
-   fun:internal_add_helper
-   fun:add_internal_entries
-   fun:setup_internal_backends
+   ...
+   fun:_PR_UnixInit
    fun:main
 }
 {
-   dirsrv_setup_internal_mapping_tree_2
+   dirsrv_des_plugin
    Memcheck:Leak
-   fun:malloc
-   fun:strdup
-   fun:slapi_ch_strdup
+   ...
+   fun:des_init
+   fun:plugin_setup
+   fun:slapd_bootstrap_config
+   fun:main
+}
+{
+   dirsrv_pwd_plugin
+   Memcheck:Leak
+   ...
+   fun:*_pwd_storage_scheme_init
+   fun:plugin_setup
+   fun:slapd_bootstrap_config
+   fun:main
+}
+{
+   dirsrv_pwd_name
+   Memcheck:Leak
+   ...
+   fun:pw_name2scheme
+   fun:config_set_storagescheme
+   fun:slapd_bootstrap_config
+   fun:main
+}
+{
+   dirsrv_ptd_plugin
+   Memcheck:Leak
+   ...
+   fun:ptd_init
+   fun:plugin_setup
+   fun:slapd_bootstrap_config
+   fun:main
+}
+{
+   dirsrv_plugin_sdn
+   Memcheck:Leak
+   ...
    fun:slapi_sdn_get_ndn
-   fun:slapi_sdn_issuffix
-   fun:op_shared_search
-   fun:search_internal_callback_pb
-   fun:search_internal_pb
-   fun:mapping_tree_node_get_children
-   fun:mapping_tree_init
-   fun:slapi_mapping_tree_select
-   fun:op_shared_add
-   fun:add_internal_pb
-   fun:internal_add_helper
-   fun:add_internal_entries
-   fun:setup_internal_backends
+   fun:plugin_setup
+   fun:slapd_bootstrap_config
    fun:main
 }
 {
-   dirsrv_setup_internal_mapping_tree_3
+   dirsrv_plugin_strdup
    Memcheck:Leak
-   fun:malloc
-   fun:strdup
+   ...
    fun:slapi_ch_strdup
-   fun:slapi_sdn_get_ndn
-   fun:slapi_sdn_compare
-   fun:mtn_get_mapping_tree_node_by_entry
-   fun:mapping_tree_entry_add
-   fun:mapping_tree_node_get_children
-   fun:mapping_tree_init
-   fun:slapi_mapping_tree_select
-   fun:op_shared_add
-   fun:add_internal_pb
-   fun:internal_add_helper
-   fun:add_internal_entries
-   fun:setup_internal_backends
+   fun:plugin_setup
+   fun:slapd_bootstrap_config
    fun:main
 }
 {
-   dirsrv_logging
+   dirsrv_plugin_sdn_dup
    Memcheck:Leak
-   fun:malloc
-   fun:strdup
-   fun:PR_NewLogModule
-   fun:_PR_InitStuff
+   ...
+   fun:slapi_sdn_dup
+   fun:plugin_setup
+   fun:slapd_bootstrap_config
    fun:main
 }
 {
-   dirsrv_io
+   dirsrv_plugin_hash
    Memcheck:Leak
-   fun:malloc
-   fun:PR_CreateStack
-   fun:_PR_InitFdCache
-   fun:_PR_InitIO
-   fun:_PR_InitStuff
+   ...
+   fun:PL_*HashTable*
+   fun:plugin_setup
+   fun:slapd_bootstrap_config
    fun:main
 }
 {
-   dirsrv_des_plugin
+   dirsrv_plugin_charray
    Memcheck:Leak
-   fun:malloc
-   fun:strdup
-   fun:slapi_ch_strdup
-   fun:des_init
+   ...
+   fun:charray_add
    fun:plugin_setup
    fun:slapd_bootstrap_config
    fun:main
 }
 {
-   dirsrv_md5_plugin
+   dirsrv_plugin_charray
    Memcheck:Leak
-   fun:malloc
-   fun:strdup
-   fun:slapi_ch_strdup
-   fun:md5_pwd_storage_scheme_init
+   ...
+   fun:PR_OpenFile
+   fun:slapd_bootstrap_config
+   fun:main
+}
+{
+   dirsrv_log
+   Memcheck:Leak
+   ...
+   fun:g_log_init
+   fun:main
+}
+{
+   dirsrv_component_id
+   Memcheck:Leak
+   ...
+   fun:generate_componentid
+   ...
+   fun:main
+}
+{
+   dirsrv_register_matchingrule
+   Memcheck:Leak
+   ...
+   fun:slapi_matchingrule_register
+   ...
+   fun:main
+}
+{
+   dirsrv_register_matchingrule_2
+   Memcheck:Leak
+   ...
+   fun:syntax_register_matching_rule_plugins
+   ...
+   fun:main
+}
+{
+   dirsrv_register_type
+   Memcheck:Leak
+   ...
+   fun:factory_register_type
+   ...
+   fun:main
+}
+{
+   dirsrv_register_sasl_2
+   Memcheck:Leak
+   ...
+   fun:slapi_register_supported_saslmechanism
+   fun:main
+}
+{
+   dirsrv_def_backend_init
+   Memcheck:Leak
+   ...
+   fun:defbackend_init
+   fun:main
+}
+{
+   dirsrv_computed
+   Memcheck:Leak
+   ...
+   fun:*computed_*
+   fun:main
+}
+{
+   dirsrv_compute
+   Memcheck:Leak
+   ...
+   fun:*compute_*
+   fun:main
+}
+{
+   dirsrv_config_set_configdir
+   Memcheck:Leak
+   ...
+   fun:config_set_configdir
+   fun:main
+}
+{
+   dirsrv_set_entry_points
+   Memcheck:Leak
+   ...
+   fun:set_entry_points
+   fun:main
+}
+{
+   dirsrv_rel2abspath_ext
+   Memcheck:Leak
+   ...
+   fun:rel2abspath_ext
+   fun:main
+}
+{
+   dirsrv_sym_load_with_flags
+   Memcheck:Leak
+   ...
+   fun:sym_load_with_flags
    fun:plugin_setup
    fun:slapd_bootstrap_config
    fun:main
 }
 {
-   dirsrv_ssha_plugin
+   dirsrv_orderingrule_init
    Memcheck:Leak
-   fun:malloc
-   fun:strdup
-   fun:slapi_ch_strdup
-   fun:ssha_pwd_storage_scheme_init
+   ...
+   fun:orderingRule_init
    fun:plugin_setup
    fun:slapd_bootstrap_config
    fun:main
 }
 {
-   dirsrv_pwd_plugin
+   dirsrv_vattr_init
    Memcheck:Leak
-   fun:malloc
-   fun:strdup
-   fun:slapi_ch_strdup
-   fun:sha_pwd_storage_scheme_init
+   ...
+   fun:vattr_init
+   fun:main
+}
+{
+   dirsrv_init_controls
+   Memcheck:Leak
+   ...
+   fun:init_controls
+   fun:main
+}
+{
+   dirsrv_init_exops
+   Memcheck:Leak
+   ...
+   fun:ldapi_init_extended_ops
+   fun:main
+}
+{
+   dirsrv_init_saslmechanisms
+   Memcheck:Leak
+   ...
+   fun:init_saslmechanisms
+   fun:main
+}
+{
+   dirsrv_other_plugin_1
+   Memcheck:Leak
+   ...
+   fun:slapi_entry_*
    fun:plugin_setup
    fun:slapd_bootstrap_config
    fun:main
 }
 {
-   dirsrv_be_plugin
+   dirsrv_other_plugin_2
    Memcheck:Leak
-   fun:malloc
-   fun:strdup
-   fun:slapi_ch_strdup
-   fun:be_init
-   fun:slapi_be_new
-   fun:be_new_internal
-   fun:init_schema_dse_ext
-   fun:init_schema_dse
-   fun:setup_internal_backends
+   ...
+   fun:slapi_ch_calloc
+   fun:plugin_setup
+   fun:slapd_bootstrap_config
    fun:main
 }
 {
-   dirsrv_dse_logging
+   dirsrv_other_plugin_3
    Memcheck:Leak
-   fun:malloc
-   fun:strdup
-   fun:slapi_ch_strdup
-   fun:log_set_mode
-   fun:config_set
-   fun:load_config_dse
-   fun:dse_call_callback.clone.3
-   fun:dse_read_one_file
-   fun:dse_read_file
-   fun:setup_internal_backends
+   ...
+   fun:PR_LoadLibraryWithFlags
+   fun:sym_load_with_flags
+   fun:plugin_setup
+   fun:slapd_bootstrap_config
    fun:main
 }
 {
-   dirsrv_dse_logging_2
+   dirsrv_slapd_init
    Memcheck:Leak
-   fun:malloc
-   fun:strdup
-   fun:slapi_ch_strdup
-   fun:log_set_rotationtimeunit
-   fun:config_set
-   fun:load_config_dse
-   fun:dse_call_callback.clone.3
-   fun:dse_read_one_file
-   fun:dse_read_file
-   fun:setup_internal_backends
+   fun:calloc
+   fun:PR_NewLock
+   fun:slapd_init
    fun:main
 }
 {
-   dirsrv_dse_logging_3
+   dirsrv_slapd_init_counter
    Memcheck:Leak
-   fun:malloc
-   fun:strdup
-   fun:slapi_ch_strdup
-   fun:log_set_mode
-   fun:config_set
-   fun:load_config_dse
-   fun:dse_call_callback.clone.3
-   fun:dse_read_one_file
-   fun:dse_read_file
-   fun:setup_internal_backends
+   ...
+   fun:slapi_counter_new
+   fun:slapd_init
    fun:main
 }
 {
-   dirsrv_be_internal
+   dirsrv_listen
    Memcheck:Leak
-   fun:malloc
-   fun:strdup
-   fun:slapi_ch_strdup
-   fun:be_init
-   fun:slapi_be_new
-   fun:be_new_internal
-   fun:setup_internal_backends
+   ...
+   fun:slapd_listenhost2addr
    fun:main
 }
 {
-   dirsrv_pwd_name
+   dirsrv_pre_setuid_init
    Memcheck:Leak
-   fun:malloc
-   fun:strdup
-   fun:slapi_ch_strdup
-   fun:pw_name2scheme
-   fun:config_set_storagescheme
+   ...
+   fun:daemon_pre_setuid_init
+   fun:main
+}
+{
+   dirsrv_boostrap_config
+   Memcheck:Leak
+   ...
+   fun:slapi_str2entry
    fun:slapd_bootstrap_config
    fun:main
 }
+{
+   dirsrv_register_control
+   Memcheck:Leak
+   ...
+   fun:slapi_register_supported_control
+   fun:main
+}
+{
+   dirsrv_strdup
+   Memcheck:Leak
+   ...
+   fun:slapi_ch_strdup
+   fun:main
+}