diff options
| author | Andreas Schwab <schwab@linux-m68k.org> | 2018-03-02 23:07:14 +0100 |
|---|---|---|
| committer | Andreas Schwab <schwab@linux-m68k.org> | 2018-03-03 17:44:24 +0100 |
| commit | eaf6753f8aac33a36deb98c1031d1bad7b593d2d (patch) | |
| tree | 383a694e8b1bac27466d4742207f55598bab5d27 | |
| parent | 4dc23804a220f917f400e2404bc4803cd60491c7 (diff) | |
| download | glibc-eaf6753f8aac33a36deb98c1031d1bad7b593d2d.tar.gz glibc-eaf6753f8aac33a36deb98c1031d1bad7b593d2d.tar.xz glibc-eaf6753f8aac33a36deb98c1031d1bad7b593d2d.zip | |
Fix multiple definitions of __nss_*_database (bug 22918)
| -rw-r--r-- | ChangeLog | 10 | ||||
| -rw-r--r-- | nscd/gai.c | 3 | ||||
| -rw-r--r-- | nss/nsswitch.c | 2 | ||||
| -rw-r--r-- | nss/nsswitch.h | 8 | ||||
| -rw-r--r-- | posix/tst-rfc3484-2.c | 1 | ||||
| -rw-r--r-- | posix/tst-rfc3484-3.c | 1 | ||||
| -rw-r--r-- | posix/tst-rfc3484.c | 1 |
7 files changed, 21 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog index f2dd409fd2..775e4c6ab3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -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. diff --git a/nscd/gai.c b/nscd/gai.c index d081747797..576fd0045b 100644 --- a/nscd/gai.c +++ b/nscd/gai.c @@ -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; diff --git a/nss/nsswitch.c b/nss/nsswitch.c index 4b8deedabf..ee46f24424 100644 --- a/nss/nsswitch.c +++ b/nss/nsswitch.c @@ -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 diff --git a/nss/nsswitch.h b/nss/nsswitch.h index eccb535ef5..63573b9ebc 100644 --- a/nss/nsswitch.h +++ b/nss/nsswitch.h @@ -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 diff --git a/posix/tst-rfc3484-2.c b/posix/tst-rfc3484-2.c index f509534ca9..8c64ac59ff 100644 --- a/posix/tst-rfc3484-2.c +++ b/posix/tst-rfc3484-2.c @@ -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. */ diff --git a/posix/tst-rfc3484-3.c b/posix/tst-rfc3484-3.c index ae44087a10..1c61aaf844 100644 --- a/posix/tst-rfc3484-3.c +++ b/posix/tst-rfc3484-3.c @@ -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. */ diff --git a/posix/tst-rfc3484.c b/posix/tst-rfc3484.c index 7f191abbbc..8f45848e44 100644 --- a/posix/tst-rfc3484.c +++ b/posix/tst-rfc3484.c @@ -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. */ |