diff options
| -rw-r--r-- | inet/Makefile | 8 | ||||
| -rw-r--r-- | inet/Versions | 6 | ||||
| -rw-r--r-- | nss/Makefile | 15 | ||||
| -rw-r--r-- | nss/Versions | 3 | ||||
| -rw-r--r-- | nss/getservent.c (renamed from inet/getservent.c) | 0 | ||||
| -rw-r--r-- | nss/getservent_r.c (renamed from inet/getservent_r.c) | 0 | ||||
| -rw-r--r-- | nss/getsrvbynm.c (renamed from inet/getsrvbynm.c) | 0 | ||||
| -rw-r--r-- | nss/getsrvbynm_r.c (renamed from inet/getsrvbynm_r.c) | 0 | ||||
| -rw-r--r-- | nss/getsrvbypt.c (renamed from inet/getsrvbypt.c) | 0 | ||||
| -rw-r--r-- | nss/getsrvbypt_r.c (renamed from inet/getsrvbypt_r.c) | 0 |
10 files changed, 19 insertions, 13 deletions
diff --git a/inet/Makefile b/inet/Makefile index 3c1987877a..d275f51b3f 100644 --- a/inet/Makefile +++ b/inet/Makefile @@ -48,13 +48,7 @@ routines := \ ether_ntoa_r \ getipv4sourcefilter \ getnameinfo \ - getservent \ - getservent_r \ getsourcefilter \ - getsrvbynm \ - getsrvbynm_r \ - getsrvbypt \ - getsrvbypt_r \ herrno \ herrno-loc \ htonl \ @@ -126,8 +120,6 @@ include ../gen-locales.mk ifeq ($(have-thread-library),yes) CFLAGS-rcmd.c += -fexceptions -CFLAGS-getservent_r.c += -fexceptions -CFLAGS-getservent.c += -fexceptions CFLAGS-either_ntoh.c += -fexceptions CFLAGS-either_hton.c += -fexceptions CFLAGS-in6_addr.c += $(config-cflags-wno-ignored-attributes) diff --git a/inet/Versions b/inet/Versions index c0c64e1543..7765cb7722 100644 --- a/inet/Versions +++ b/inet/Versions @@ -15,8 +15,6 @@ libc { # g* getdomainname; - getservbyname; getservbyname_r; getservbyport; - getservbyport_r; getservent; getservent_r; # h* htonl; htons; @@ -46,9 +44,7 @@ libc { # g* getaliasbyname_r; getaliasent_r; gethostbyaddr_r; gethostbyname2_r; gethostbyname_r; gethostent_r; getnetbyaddr_r; getnetbyname_r; - getnetent_r; getservbyname_r; - getservbyport_r; - getservent_r; + getnetent_r; } GLIBC_2.2 { # i* diff --git a/nss/Makefile b/nss/Makefile index cbfd5dc692..e88754bf51 100644 --- a/nss/Makefile +++ b/nss/Makefile @@ -229,6 +229,21 @@ CFLAGS-getrpcent_r.c += -fexceptions CFLAGS-getrpcent.c += -fexceptions endif +# services routines: +routines += \ + getservent \ + getservent_r \ + getsrvbynm \ + getsrvbynm_r \ + getsrvbypt \ + getsrvbypt_r \ + # routines + +ifeq ($(have-thread-library),yes) +CFLAGS-getservent_r.c += -fexceptions +CFLAGS-getservent.c += -fexceptions +endif + # shadow routines routines += \ fgetspent \ diff --git a/nss/Versions b/nss/Versions index b7491154bf..d8c4e373c9 100644 --- a/nss/Versions +++ b/nss/Versions @@ -32,6 +32,8 @@ libc { getpw; getpwent; getpwent_r; getpwnam; getpwnam_r; getpwuid; getpwuid_r; getrpcbyname; getrpcbyname_r; getrpcbynumber; getrpcbynumber_r; getrpcent; getrpcent_r; + getservbyname; getservbyname_r; getservbyport; + getservbyport_r; getservent; getservent_r; getspent; getspent_r; getspnam; getspnam_r; # i* @@ -64,6 +66,7 @@ libc { getnetgrent_r; getprotobyname_r; getprotobynumber_r; getprotoent_r; getpwent_r; getpwuid_r; getpwnam_r; + getservbyname_r; getservbyport_r; getservent_r; getspent_r; getspnam_r; } GLIBC_2.2.2 { diff --git a/inet/getservent.c b/nss/getservent.c index 8acd81ea9a..8acd81ea9a 100644 --- a/inet/getservent.c +++ b/nss/getservent.c diff --git a/inet/getservent_r.c b/nss/getservent_r.c index f57a7f24b8..f57a7f24b8 100644 --- a/inet/getservent_r.c +++ b/nss/getservent_r.c diff --git a/inet/getsrvbynm.c b/nss/getsrvbynm.c index c90a99da1c..c90a99da1c 100644 --- a/inet/getsrvbynm.c +++ b/nss/getsrvbynm.c diff --git a/inet/getsrvbynm_r.c b/nss/getsrvbynm_r.c index e90659477d..e90659477d 100644 --- a/inet/getsrvbynm_r.c +++ b/nss/getsrvbynm_r.c diff --git a/inet/getsrvbypt.c b/nss/getsrvbypt.c index d6292c66d9..d6292c66d9 100644 --- a/inet/getsrvbypt.c +++ b/nss/getsrvbypt.c diff --git a/inet/getsrvbypt_r.c b/nss/getsrvbypt_r.c index c01ea347d5..c01ea347d5 100644 --- a/inet/getsrvbypt_r.c +++ b/nss/getsrvbypt_r.c |