diff options
Diffstat (limited to 'nss')
| -rw-r--r-- | nss/Makefile | 32 | ||||
| -rw-r--r-- | nss/nss_action_parse.c | 5 | ||||
| -rw-r--r-- | nss/nss_test1.c | 6 |
3 files changed, 23 insertions, 20 deletions
diff --git a/nss/Makefile b/nss/Makefile index 09ce94a..1991b74 100644 --- a/nss/Makefile +++ b/nss/Makefile @@ -476,39 +476,39 @@ libof-nss_test1 = extramodules libof-nss_test2 = extramodules libof-nss_test_errno = extramodules libof-nss_test_gai_hv2_canonname = extramodules -$(objpfx)/libnss_test1.so: $(objpfx)nss_test1.os $(link-libc-deps) +$(objpfx)libnss_test1.so: $(objpfx)nss_test1.os $(link-libc-deps) $(build-module) -$(objpfx)/libnss_test2.so: $(objpfx)nss_test2.os $(link-libc-deps) +$(objpfx)libnss_test2.so: $(objpfx)nss_test2.os $(link-libc-deps) $(build-module) -$(objpfx)/libnss_test_errno.so: $(objpfx)nss_test_errno.os $(link-libc-deps) +$(objpfx)libnss_test_errno.so: $(objpfx)nss_test_errno.os $(link-libc-deps) $(build-module) -$(objpfx)/libnss_test_gai_hv2_canonname.so: \ +$(objpfx)libnss_test_gai_hv2_canonname.so: \ $(objpfx)nss_test_gai_hv2_canonname.os $(link-libc-deps) $(build-module) $(objpfx)nss_test2.os : nss_test1.c # Use the nss_files suffix for these objects as well. -$(objpfx)/libnss_test1.so$(libnss_files.so-version): $(objpfx)/libnss_test1.so +$(objpfx)libnss_test1.so$(libnss_files.so-version): $(objpfx)libnss_test1.so $(make-link) -$(objpfx)/libnss_test2.so$(libnss_files.so-version): $(objpfx)/libnss_test2.so +$(objpfx)libnss_test2.so$(libnss_files.so-version): $(objpfx)libnss_test2.so $(make-link) -$(objpfx)/libnss_test_errno.so$(libnss_files.so-version): \ - $(objpfx)/libnss_test_errno.so +$(objpfx)libnss_test_errno.so$(libnss_files.so-version): \ + $(objpfx)libnss_test_errno.so $(make-link) -$(objpfx)/libnss_test_gai_hv2_canonname.so$(libnss_files.so-version): \ - $(objpfx)/libnss_test_gai_hv2_canonname.so +$(objpfx)libnss_test_gai_hv2_canonname.so$(libnss_files.so-version): \ + $(objpfx)libnss_test_gai_hv2_canonname.so $(make-link) $(patsubst %,$(objpfx)%.out,$(tests) $(tests-container)) : \ - $(objpfx)/libnss_test1.so$(libnss_files.so-version) \ - $(objpfx)/libnss_test2.so$(libnss_files.so-version) \ - $(objpfx)/libnss_test_errno.so$(libnss_files.so-version) \ - $(objpfx)/libnss_test_gai_hv2_canonname.so$(libnss_files.so-version) + $(objpfx)libnss_test1.so$(libnss_files.so-version) \ + $(objpfx)libnss_test2.so$(libnss_files.so-version) \ + $(objpfx)libnss_test_errno.so$(libnss_files.so-version) \ + $(objpfx)libnss_test_gai_hv2_canonname.so$(libnss_files.so-version) ifeq (yes,$(have-thread-library)) $(objpfx)tst-cancel-getpwuid_r: $(shared-thread-library) endif -$(objpfx)tst-nss-files-alias-leak.out: $(objpfx)/libnss_files.so -$(objpfx)tst-nss-files-alias-truncated.out: $(objpfx)/libnss_files.so +$(objpfx)tst-nss-files-alias-leak.out: $(objpfx)libnss_files.so +$(objpfx)tst-nss-files-alias-truncated.out: $(objpfx)libnss_files.so tst-nss-gai-hv2-canonname-ENV = \ MALLOC_TRACE=$(objpfx)tst-nss-gai-hv2-canonname.mtrace \ diff --git a/nss/nss_action_parse.c b/nss/nss_action_parse.c index 2b67a8a..ee3aadf 100644 --- a/nss/nss_action_parse.c +++ b/nss/nss_action_parse.c @@ -168,13 +168,16 @@ nss_action_list action_list_init (&list); if (nss_action_parse (line, &list)) { + nss_action_list retval; size_t size; struct nss_action null_service = { .module = NULL, }; action_list_add (&list, null_service); size = action_list_size (&list); - return __nss_action_allocate (action_list_begin (&list), size); + retval = __nss_action_allocate (action_list_begin (&list), size); + action_list_free (&list); + return retval; } else if (action_list_has_failed (&list)) { diff --git a/nss/nss_test1.c b/nss/nss_test1.c index f023f46..b715bc3 100644 --- a/nss/nss_test1.c +++ b/nss/nss_test1.c @@ -28,9 +28,9 @@ to test known bad data. */ #define alloc_buffer_maybe_copy_string(b,s) s ? alloc_buffer_copy_string (b, s) : NULL; -/* This file is the master template. Other instances of this test - module should define NAME(x) to have their name instead of "test1", - then include this file. +/* This file is both a standalone test and a parametrized template. + Other instances of this test module should define NAME(x) to have + their name instead of "test1", then include this file. */ #define NAME_(x,n) _nss_##n##_##x #ifndef NAME |