]>
Commit | Line | Data |
---|---|---|
92ae11e3 SS |
1 | From 87ef46f4bd0745b13ee49f5487bc8a45ea2f3c1d Mon Sep 17 00:00:00 2001 |
2 | From: Lukas Slebodnik <lslebodn@redhat.com> | |
3 | Date: Mon, 17 Oct 2016 22:17:27 +0200 | |
4 | Subject: [PATCH 09/39] dlopen-test: Move libraries to the right "sections" | |
5 | MIME-Version: 1.0 | |
6 | Content-Type: text/plain; charset=UTF-8 | |
7 | Content-Transfer-Encoding: 8bit | |
8 | ||
9 | The library winbind_idmap_sss.so is build only when building | |
10 | with samba. The library libdlopen_test_providers.so was moved | |
11 | to the group of libraries build for testing purposes. | |
12 | ||
13 | Reviewed-by: Petr Čech <pcech@redhat.com> | |
14 | (cherry picked from commit d708e53d0df0c1ed4cc0097bebfa2a84d7b20fad) | |
15 | (cherry picked from commit a52c7df943a7b685609b66c49264c6d1805d31c2) | |
16 | --- | |
17 | src/tests/dlopen-tests.c | 9 ++++----- | |
18 | 1 file changed, 4 insertions(+), 5 deletions(-) | |
19 | ||
20 | diff --git a/src/tests/dlopen-tests.c b/src/tests/dlopen-tests.c | |
21 | index c980ab9f1..c857dff73 100644 | |
22 | --- a/src/tests/dlopen-tests.c | |
23 | +++ b/src/tests/dlopen-tests.c | |
24 | @@ -71,9 +71,6 @@ struct so { | |
25 | #ifdef HAVE_CIFS_IDMAP_PLUGIN | |
26 | { "cifs_idmap_sss.so", { LIBPFX"cifs_idmap_sss.so", NULL } }, | |
27 | #endif | |
28 | - { "winbind_idmap_sss.so", { LIBPFX"libdlopen_test_winbind_idmap.so", | |
29 | - LIBPFX"winbind_idmap_sss.so", | |
30 | - NULL } }, | |
31 | { "memberof.so", { LIBPFX"memberof.so", NULL } }, | |
32 | { "libsss_child.so", { LIBPFX"libsss_util.so", | |
33 | LIBPFX"libsss_child.so", NULL } }, | |
34 | @@ -87,6 +84,8 @@ struct so { | |
35 | LIBPFX"libsss_ad.so", NULL } }, | |
36 | { "libsss_ipa.so", { LIBPFX"libdlopen_test_providers.so", | |
37 | LIBPFX"libsss_ipa.so", NULL } }, | |
38 | + { "winbind_idmap_sss.so", { LIBPFX"libdlopen_test_winbind_idmap.so", | |
39 | + LIBPFX"winbind_idmap_sss.so", NULL } }, | |
40 | #endif /* BUILD_SAMBA */ | |
41 | { "libsss_krb5.so", { LIBPFX"libdlopen_test_providers.so", | |
42 | LIBPFX"libsss_krb5.so", NULL } }, | |
43 | @@ -98,8 +97,6 @@ struct so { | |
44 | LIBPFX"libsss_ldap_common.so", NULL } }, | |
45 | { "libsss_proxy.so", { LIBPFX"libdlopen_test_providers.so", | |
46 | LIBPFX"libsss_proxy.so", NULL } }, | |
47 | - { "libdlopen_test_providers.so", { LIBPFX"libdlopen_test_providers.so", | |
48 | - NULL } }, | |
49 | #ifdef HAVE_PYTHON2_BINDINGS | |
50 | { "_py2hbac.so", { LIBPFX"_py2hbac.so", NULL } }, | |
51 | { "_py2sss.so", { LIBPFX"_py2sss.so", NULL } }, | |
52 | @@ -119,6 +116,8 @@ struct so { | |
53 | { "sss.so", { LIBPFX"sss.so", NULL } }, | |
54 | #endif | |
55 | /* for testing purposes */ | |
56 | + { "libdlopen_test_providers.so", { LIBPFX"libdlopen_test_providers.so", | |
57 | + NULL } }, | |
58 | { "libsss_nss_idmap_tests.so", { LIBPFX"libsss_nss_idmap_tests.so", | |
59 | NULL } }, | |
60 | #ifdef BUILD_SAMBA | |
61 | -- | |
62 | 2.11.0 | |
63 |