Move 'rpc' routines from 'inet' into 'nss'

The getrpcby* and getrpcent* routines are entry points for nss
functionality.  This commit moves them from the 'inet' subdirectory to
'nss'.  The Versions entries for these routines along with a test,
located in the 'sunrpc' subdirectory, are also moved into 'nss'.
Reviewed-by: Adhemerval Zanella  <adhemerval.zanella@linaro.org>

3 files changed, 2 insertions, 77 deletions

diff --git a/sunrpc/Makefile b/sunrpc/Makefile
index ec2ea04ca9..83a0f2d099 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 77bc6a4c9b..cba6e36422 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;
diff --git a/sunrpc/test-rpcent.c b/sunrpc/test-rpcent.c
deleted file mode 100644
index a3b1a21893..0000000000
--- a/sunrpc/test-rpcent.c
+++ /dev/null
@@ -1,74 +0,0 @@
-/* Test getrpcent and friends.
-   Copyright (C) 2015-2023 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <https://www.gnu.org/licenses/>.  */
-
-/* This is taken from nss/test-netdb.c and is intended to follow that
-   test's model for everything.  This test is separate only because
-   the <rpc/netdb.h> interfaces do not exist in configurations that
-   omit sunrpc/ from the build.  */
-
-#include <stdio.h>
-#include <rpc/netdb.h>
-
-
-static void
-output_rpcent (const char *call, struct rpcent *rptr)
-{
-  char **pptr;
-
-  if (rptr == NULL)
-    printf ("Call: %s returned NULL\n", call);
-  else
-    {
-      printf ("Call: %s, returned: r_name: %s, r_number: %d\n",
-		call, rptr->r_name, rptr->r_number);
-      for (pptr = rptr->r_aliases; *pptr != NULL; pptr++)
-	printf ("  alias: %s\n", *pptr);
-    }
-}
-
-static void
-test_rpc (void)
-{
-  struct rpcent *rptr;
-
-  rptr = getrpcbyname ("portmap");
-  output_rpcent ("getrpcyname (\"portmap\")", rptr);
-
-  rptr = getrpcbynumber (100000);
-  output_rpcent ("getrpcbynumber (100000)", rptr);
-
-  setrpcent (0);
-  do
-    {
-      rptr = getrpcent ();
-      output_rpcent ("getrpcent ()", rptr);
-    }
-  while (rptr != NULL);
-  endrpcent ();
-}
-
-static int
-do_test (void)
-{
-  test_rpc ();
-
-  return 0;
-}
-
-#define TEST_FUNCTION do_test ()
-#include "../test-skeleton.c"