diff options
| -rw-r--r-- | inet/Makefile | 8 | ||||
| -rw-r--r-- | nss/Makefile | 16 | ||||
| -rw-r--r-- | nss/Versions | 2 | ||||
| -rw-r--r-- | nss/getrpcbyname.c (renamed from inet/getrpcbyname.c) | 0 | ||||
| -rw-r--r-- | nss/getrpcbyname_r.c (renamed from inet/getrpcbyname_r.c) | 0 | ||||
| -rw-r--r-- | nss/getrpcbynumber.c (renamed from inet/getrpcbynumber.c) | 0 | ||||
| -rw-r--r-- | nss/getrpcbynumber_r.c (renamed from inet/getrpcbynumber_r.c) | 0 | ||||
| -rw-r--r-- | nss/getrpcent.c (renamed from inet/getrpcent.c) | 0 | ||||
| -rw-r--r-- | nss/getrpcent_r.c (renamed from inet/getrpcent_r.c) | 0 | ||||
| -rw-r--r-- | nss/test-rpcent.c (renamed from sunrpc/test-rpcent.c) | 0 | ||||
| -rw-r--r-- | sunrpc/Makefile | 2 | ||||
| -rw-r--r-- | sunrpc/Versions | 3 |
12 files changed, 20 insertions, 11 deletions
diff --git a/inet/Makefile b/inet/Makefile index dab7182..3c19878 100644 --- a/inet/Makefile +++ b/inet/Makefile @@ -48,12 +48,6 @@ routines := \ ether_ntoa_r \ getipv4sourcefilter \ getnameinfo \ - getrpcbyname \ - getrpcbyname_r \ - getrpcbynumber \ - getrpcbynumber_r \ - getrpcent \ - getrpcent_r \ getservent \ getservent_r \ getsourcefilter \ @@ -132,8 +126,6 @@ include ../gen-locales.mk ifeq ($(have-thread-library),yes) CFLAGS-rcmd.c += -fexceptions -CFLAGS-getrpcent_r.c += -fexceptions -CFLAGS-getrpcent.c += -fexceptions CFLAGS-getservent_r.c += -fexceptions CFLAGS-getservent.c += -fexceptions CFLAGS-either_ntoh.c += -fexceptions diff --git a/nss/Makefile b/nss/Makefile index df22d36..cbfd5dc 100644 --- a/nss/Makefile +++ b/nss/Makefile @@ -214,6 +214,21 @@ CFLAGS-getpwent.c += -fexceptions CFLAGS-getpwent_r.c += -fexceptions endif +# rpc routines: +routines += \ + getrpcbyname \ + getrpcbyname_r \ + getrpcbynumber \ + getrpcbynumber_r \ + getrpcent \ + getrpcent_r \ + # routines + +ifeq ($(have-thread-library),yes) +CFLAGS-getrpcent_r.c += -fexceptions +CFLAGS-getrpcent.c += -fexceptions +endif + # shadow routines routines += \ fgetspent \ @@ -276,6 +291,7 @@ tests := \ bug17079 \ test-digits-dots \ test-netdb \ + test-rpcent \ testgrp \ tst-fgetsgent_r \ tst-gethnm \ diff --git a/nss/Versions b/nss/Versions index c5de97f..b749115 100644 --- a/nss/Versions +++ b/nss/Versions @@ -30,6 +30,8 @@ libc { getprotobyname; getprotobyname_r; getprotobynumber; getprotobynumber_r; getprotoent; getprotoent_r; getpw; getpwent; getpwent_r; getpwnam; getpwnam_r; getpwuid; getpwuid_r; + getrpcbyname; getrpcbyname_r; getrpcbynumber; getrpcbynumber_r; + getrpcent; getrpcent_r; getspent; getspent_r; getspnam; getspnam_r; # i* diff --git a/inet/getrpcbyname.c b/nss/getrpcbyname.c index ef2114b..ef2114b 100644 --- a/inet/getrpcbyname.c +++ b/nss/getrpcbyname.c diff --git a/inet/getrpcbyname_r.c b/nss/getrpcbyname_r.c index c1a383a..c1a383a 100644 --- a/inet/getrpcbyname_r.c +++ b/nss/getrpcbyname_r.c diff --git a/inet/getrpcbynumber.c b/nss/getrpcbynumber.c index 0689a36..0689a36 100644 --- a/inet/getrpcbynumber.c +++ b/nss/getrpcbynumber.c diff --git a/inet/getrpcbynumber_r.c b/nss/getrpcbynumber_r.c index eb2ce8f..eb2ce8f 100644 --- a/inet/getrpcbynumber_r.c +++ b/nss/getrpcbynumber_r.c diff --git a/inet/getrpcent.c b/nss/getrpcent.c index 511cd53..511cd53 100644 --- a/inet/getrpcent.c +++ b/nss/getrpcent.c diff --git a/inet/getrpcent_r.c b/nss/getrpcent_r.c index 4df706c..4df706c 100644 --- a/inet/getrpcent_r.c +++ b/nss/getrpcent_r.c diff --git a/sunrpc/test-rpcent.c b/nss/test-rpcent.c index a3b1a21..a3b1a21 100644 --- a/sunrpc/test-rpcent.c +++ b/nss/test-rpcent.c diff --git a/sunrpc/Makefile b/sunrpc/Makefile index ec2ea04..83a0f2d 100644 --- a/sunrpc/Makefile +++ b/sunrpc/Makefile @@ -64,7 +64,7 @@ routines := auth_none authuxprot clnt_raw clnt_simp \ shared-only-routines = $(routines) endif -tests = tst-xdrmem tst-xdrmem2 test-rpcent tst-udp-error tst-udp-timeout \ +tests = tst-xdrmem tst-xdrmem2 tst-udp-error tst-udp-timeout \ tst-udp-nonblocking tst-bug22542 tst-bug28768 xtests := tst-getmyaddr diff --git a/sunrpc/Versions b/sunrpc/Versions index 77bc6a4..cba6e36 100644 --- a/sunrpc/Versions +++ b/sunrpc/Versions @@ -26,8 +26,7 @@ libc { # g* get_myaddress; getpublickey; getsecretkey; - getrpcbyname; getrpcbyname_r; getrpcbynumber; getrpcbynumber_r; - getrpcent; getrpcent_r; getrpcport; + getrpcport; # p* pmap_getmaps; pmap_getport; pmap_rmtcall; pmap_set; pmap_unset; |