OpenE2K
/
glibc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix multiple definitions of __nss_*_database (bug 22918)

This commit is contained in:
Andreas Schwab 2018-03-02 23:07:14 +01:00
parent 4dc23804a2
commit eaf6753f8a
7 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ChangeLog
View File

@ -1,3 +1,13 @@
2018-03-03 Andreas Schwab <schwab@linux-m68k.org>
[BZ #22918]
* nss/nsswitch.h (DEFINE_DATABASE): Don't define __nss_*_database.
* nss/nsswitch.c (DEFINE_DATABASE): Define __nss_*_database here.
* nscd/gai.c (__nss_hosts_database): Readd definition.
* posix/tst-rfc3484.c (__nss_hosts_database): Likewise.
* posix/tst-rfc3484-3.c (__nss_hosts_database): Likewise.
* posix/tst-rfc3484-2.c (__nss_hosts_database): Likewise.
2018-03-02 Joseph Myers <joseph@codesourcery.com>
* sysdeps/powerpc/ifunc-sel.h (ifunc_sel): Make always_inline.

3
nscd/gai.c
View File

@ -45,3 +45,6 @@
#ifdef HAVE_LIBIDN
# include <libidn/idn-stub.c>
#endif
/* Some variables normally defined in libc. */
service_user *__nss_hosts_database attribute_hidden;

2
nss/nsswitch.c
View File

@ -62,7 +62,7 @@ static service_library *nss_new_service (name_database *database,
/* Declare external database variables. */
#define DEFINE_DATABASE(name) \
extern service_user *__nss_##name##_database attribute_hidden; \
service_user *__nss_##name##_database attribute_hidden; \
weak_extern (__nss_##name##_database)
#include "databases.def"
#undef DEFINE_DATABASE

8
nss/nsswitch.h
View File

@ -226,10 +226,10 @@ libc_hidden_proto (__nss_hostname_digits_dots)
#define MAX_NR_ADDRS 48
/* Prototypes for __nss_*_lookup2 functions. */
#define DEFINE_DATABASE(arg) \
service_user *__nss_##arg##_database attribute_hidden; \
int __nss_##arg##_lookup2 (service_user **, const char *, \
const char *, void **); \
#define DEFINE_DATABASE(arg) \
extern service_user *__nss_##arg##_database attribute_hidden; \
int __nss_##arg##_lookup2 (service_user **, const char *, \
const char *, void **); \
libc_hidden_proto (__nss_##arg##_lookup2)
#include "databases.def"
#undef DEFINE_DATABASE

1
posix/tst-rfc3484-2.c
View File

@ -58,6 +58,7 @@ _res_hconf_init (void)
#undef USE_NSCD
#include "../sysdeps/posix/getaddrinfo.c"
service_user *__nss_hosts_database attribute_hidden;
/* This is the beginning of the real test code. The above defines
(among other things) the function rfc3484_sort. */

1
posix/tst-rfc3484-3.c
View File

@ -58,6 +58,7 @@ _res_hconf_init (void)
#undef USE_NSCD
#include "../sysdeps/posix/getaddrinfo.c"
service_user *__nss_hosts_database attribute_hidden;
/* This is the beginning of the real test code. The above defines
(among other things) the function rfc3484_sort. */

1
posix/tst-rfc3484.c
View File

@ -58,6 +58,7 @@ _res_hconf_init (void)
#undef USE_NSCD
#include "../sysdeps/posix/getaddrinfo.c"
service_user *__nss_hosts_database attribute_hidden;
/* This is the beginning of the real test code. The above defines
(among other things) the function rfc3484_sort. */