From 78fb1789e8a5c2c7c51ad9002bbbdf0a1e390bdf Mon Sep 17 00:00:00 2001 From: Jakub Hrozek Date: Fri, 29 May 2015 16:04:44 +0200 Subject: TESTS: Move krb5_try_kdcip to nested group test Avoids duplicate errors during linking. Reviewed-by: Sumit Bose --- src/tests/cmocka/common_mock_sdap.c | 8 -------- src/tests/cmocka/common_mock_sdap.h | 7 ------- src/tests/cmocka/test_nested_groups.c | 8 ++++++++ 3 files changed, 8 insertions(+), 15 deletions(-) (limited to 'src/tests/cmocka') diff --git a/src/tests/cmocka/common_mock_sdap.c b/src/tests/cmocka/common_mock_sdap.c index 1adfc7cae..cef321613 100644 --- a/src/tests/cmocka/common_mock_sdap.c +++ b/src/tests/cmocka/common_mock_sdap.c @@ -25,14 +25,6 @@ #include "providers/ldap/sdap.h" #include "tests/cmocka/common_mock.h" -errno_t krb5_try_kdcip(struct confdb_ctx *cdb, - const char *conf_path, - struct dp_option *opts, - int opt_id) -{ - return EOK; -} - struct sdap_id_ctx *mock_sdap_id_ctx(TALLOC_CTX *mem_ctx, struct be_ctx *be_ctx, struct sdap_options *sdap_opts) diff --git a/src/tests/cmocka/common_mock_sdap.h b/src/tests/cmocka/common_mock_sdap.h index 6fd1fb79c..747287d1f 100644 --- a/src/tests/cmocka/common_mock_sdap.h +++ b/src/tests/cmocka/common_mock_sdap.h @@ -26,13 +26,6 @@ #include "util/util.h" #include "providers/ldap/sdap.h" -/* We don't want to load KRB5 provider sources just for one - * deprecated option. */ -errno_t krb5_try_kdcip(struct confdb_ctx *cdb, - const char *conf_path, - struct dp_option *opts, - int opt_id); - struct sdap_options *mock_sdap_options_ldap(TALLOC_CTX *mem_ctx, struct sss_domain_info *domain, struct confdb_ctx *confdb_ctx, diff --git a/src/tests/cmocka/test_nested_groups.c b/src/tests/cmocka/test_nested_groups.c index 390b39950..eef9df2dc 100644 --- a/src/tests/cmocka/test_nested_groups.c +++ b/src/tests/cmocka/test_nested_groups.c @@ -67,6 +67,14 @@ struct nested_groups_test_ctx { unsigned long num_groups; }; +errno_t krb5_try_kdcip(struct confdb_ctx *cdb, + const char *conf_path, + struct dp_option *opts, + int opt_id) +{ + return EOK; +} + /* Both arrays must have the same length! */ static void compare_sysdb_string_array_noorder(struct sysdb_attrs **sysdb_array, const char **string_array, -- cgit