diff options
| -rw-r--r-- | inet/Makefile | 17 | ||||
| -rw-r--r-- | inet/Versions | 4 | ||||
| -rw-r--r-- | nss/Makefile | 24 | ||||
| -rw-r--r-- | nss/Versions | 2 | ||||
| -rw-r--r-- | nss/gethstbyad.c (renamed from inet/gethstbyad.c) | 0 | ||||
| -rw-r--r-- | nss/gethstbyad_r.c (renamed from inet/gethstbyad_r.c) | 0 | ||||
| -rw-r--r-- | nss/gethstbynm.c (renamed from inet/gethstbynm.c) | 0 | ||||
| -rw-r--r-- | nss/gethstbynm2.c (renamed from inet/gethstbynm2.c) | 0 | ||||
| -rw-r--r-- | nss/gethstbynm2_r.c (renamed from inet/gethstbynm2_r.c) | 0 | ||||
| -rw-r--r-- | nss/gethstbynm_r.c (renamed from inet/gethstbynm_r.c) | 0 | ||||
| -rw-r--r-- | nss/gethstent.c (renamed from inet/gethstent.c) | 0 | ||||
| -rw-r--r-- | nss/gethstent_r.c (renamed from inet/gethstent_r.c) | 0 | ||||
| -rw-r--r-- | nss/tst-gethnm.c (renamed from inet/tst-gethnm.c) | 0 |
13 files changed, 27 insertions, 20 deletions
diff --git a/inet/Makefile b/inet/Makefile index 4d053de748..d378542549 100644 --- a/inet/Makefile +++ b/inet/Makefile @@ -46,14 +46,6 @@ routines := \ ether_line \ ether_ntoa \ ether_ntoa_r \ - gethstbyad \ - gethstbyad_r \ - gethstbynm \ - gethstbynm2 \ - gethstbynm2_r \ - gethstbynm_r \ - gethstent \ - gethstent_r \ getipv4sourcefilter \ getnameinfo \ getnetbyad \ @@ -123,7 +115,6 @@ tests := \ tst-checks-posix \ tst-ether_aton \ tst-ether_line \ - tst-gethnm \ tst-getni1 \ tst-getni2 \ tst-if_index-long \ @@ -154,14 +145,6 @@ include ../gen-locales.mk ifeq ($(have-thread-library),yes) -CFLAGS-gethstbyad_r.c += -fexceptions -CFLAGS-gethstbyad.c += -fexceptions -CFLAGS-gethstbynm_r.c += -fexceptions -CFLAGS-gethstbynm.c += -fexceptions -CFLAGS-gethstbynm2_r.c += -fexceptions -CFLAGS-gethstbynm2.c += -fexceptions -CFLAGS-gethstent_r.c += -fexceptions -CFLAGS-gethstent.c += -fexceptions CFLAGS-rcmd.c += -fexceptions CFLAGS-getnetbynm_r.c += -fexceptions CFLAGS-getnetbynm.c += -fexceptions diff --git a/inet/Versions b/inet/Versions index a7c1a0fb6f..d937e9835c 100644 --- a/inet/Versions +++ b/inet/Versions @@ -14,9 +14,7 @@ libc { ether_ntoa_r; # g* - getdomainname; gethostbyaddr; gethostbyaddr_r; gethostbyname; - gethostbyname2; gethostbyname2_r; gethostbyname_r; gethostent; - gethostent_r; getnetbyaddr; getnetbyaddr_r; getnetbyname; + getdomainname; getnetbyaddr; getnetbyaddr_r; getnetbyname; getnetbyname_r; getnetent; getnetent_r; getnetgrent; getnetgrent_r; getprotobyname; getprotobyname_r; getprotobynumber; getprotobynumber_r; getprotoent; getprotoent_r; diff --git a/nss/Makefile b/nss/Makefile index 148c6dc1cf..d0b564a033 100644 --- a/nss/Makefile +++ b/nss/Makefile @@ -125,6 +125,29 @@ CFLAGS-getsgnam.c += -fexceptions CFLAGS-getsgnam_r.c += -fexceptions endif +# hosts routines: +routines += \ + gethstbyad \ + gethstbyad_r \ + gethstbynm \ + gethstbynm2 \ + gethstbynm2_r \ + gethstbynm_r \ + gethstent \ + gethstent_r \ + # routines + +ifeq ($(have-thread-library),yes) +CFLAGS-gethstbyad.c += -fexceptions +CFLAGS-gethstbyad_r.c += -fexceptions +CFLAGS-gethstbynm.c += -fexceptions +CFLAGS-gethstbynm_r.c += -fexceptions +CFLAGS-gethstbynm2.c += -fexceptions +CFLAGS-gethstbynm2_r.c += -fexceptions +CFLAGS-gethstent.c += -fexceptions +CFLAGS-gethstent_r.c += -fexceptions +endif + # pwd routines: routines += \ fgetpwent \ @@ -210,6 +233,7 @@ tests := \ test-netdb \ testgrp \ tst-fgetsgent_r \ + tst-gethnm \ tst-getpw \ tst-gshadow \ tst-nss-getpwent \ diff --git a/nss/Versions b/nss/Versions index 99208cb9df..74ba4470d8 100644 --- a/nss/Versions +++ b/nss/Versions @@ -21,6 +21,8 @@ libc { getaliasbyname; getaliasbyname_r; getaliasent; getaliasent_r; getgrent; getgrent_r; getgrgid; getgrgid_r; getgrnam; getgrnam_r; getgroups; + gethostbyaddr; gethostbyaddr_r; gethostbyname; gethostbyname2; + gethostbyname2_r; gethostbyname_r; gethostent; gethostent_r; getpw; getpwent; getpwent_r; getpwnam; getpwnam_r; getpwuid; getpwuid_r; getspent; getspent_r; getspnam; getspnam_r; diff --git a/inet/gethstbyad.c b/nss/gethstbyad.c index 1b0fc982e4..1b0fc982e4 100644 --- a/inet/gethstbyad.c +++ b/nss/gethstbyad.c diff --git a/inet/gethstbyad_r.c b/nss/gethstbyad_r.c index ee1b1d12ee..ee1b1d12ee 100644 --- a/inet/gethstbyad_r.c +++ b/nss/gethstbyad_r.c diff --git a/inet/gethstbynm.c b/nss/gethstbynm.c index 6134dec455..6134dec455 100644 --- a/inet/gethstbynm.c +++ b/nss/gethstbynm.c diff --git a/inet/gethstbynm2.c b/nss/gethstbynm2.c index 6d1421b06a..6d1421b06a 100644 --- a/inet/gethstbynm2.c +++ b/nss/gethstbynm2.c diff --git a/inet/gethstbynm2_r.c b/nss/gethstbynm2_r.c index e0c373513d..e0c373513d 100644 --- a/inet/gethstbynm2_r.c +++ b/nss/gethstbynm2_r.c diff --git a/inet/gethstbynm_r.c b/nss/gethstbynm_r.c index c224673544..c224673544 100644 --- a/inet/gethstbynm_r.c +++ b/nss/gethstbynm_r.c diff --git a/inet/gethstent.c b/nss/gethstent.c index 2bfe27443d..2bfe27443d 100644 --- a/inet/gethstent.c +++ b/nss/gethstent.c diff --git a/inet/gethstent_r.c b/nss/gethstent_r.c index 00957fc1c1..00957fc1c1 100644 --- a/inet/gethstent_r.c +++ b/nss/gethstent_r.c diff --git a/inet/tst-gethnm.c b/nss/tst-gethnm.c index dd3a547811..dd3a547811 100644 --- a/inet/tst-gethnm.c +++ b/nss/tst-gethnm.c |