mirror of
https://sourceware.org/git/glibc.git
synced 2025-08-07 06:43:00 +03:00
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>
This commit is contained in:
Arjun Shankar
16
nss/Makefile
16
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 \
|
||||
|
||||
@@ -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*
|
||||
|
||||
31
nss/getrpcbyname.c
Normal file
31
nss/getrpcbyname.c
Normal file
@@ -0,0 +1,31 @@
|
||||
/* Copyright (C) 1996-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/>. */
|
||||
|
||||
#include <rpc/netdb.h>
|
||||
|
||||
|
||||
#define LOOKUP_TYPE struct rpcent
|
||||
#define FUNCTION_NAME getrpcbyname
|
||||
#define DATABASE_NAME rpc
|
||||
#define ADD_PARAMS const char *name
|
||||
#define ADD_VARIABLES name
|
||||
#define BUFLEN 1024
|
||||
|
||||
/* There is no nscd support for the rpc file. */
|
||||
#undef USE_NSCD
|
||||
|
||||
#include "../nss/getXXbyYY.c"
|
||||
30
nss/getrpcbyname_r.c
Normal file
30
nss/getrpcbyname_r.c
Normal file
@@ -0,0 +1,30 @@
|
||||
/* Copyright (C) 1996-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/>. */
|
||||
|
||||
#include <rpc/netdb.h>
|
||||
|
||||
|
||||
#define LOOKUP_TYPE struct rpcent
|
||||
#define FUNCTION_NAME getrpcbyname
|
||||
#define DATABASE_NAME rpc
|
||||
#define ADD_PARAMS const char *name
|
||||
#define ADD_VARIABLES name
|
||||
|
||||
/* There is no nscd support for the rpc file. */
|
||||
#undef USE_NSCD
|
||||
|
||||
#include "../nss/getXXbyYY_r.c"
|
||||
31
nss/getrpcbynumber.c
Normal file
31
nss/getrpcbynumber.c
Normal file
@@ -0,0 +1,31 @@
|
||||
/* Copyright (C) 1996-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/>. */
|
||||
|
||||
#include <rpc/netdb.h>
|
||||
|
||||
|
||||
#define LOOKUP_TYPE struct rpcent
|
||||
#define FUNCTION_NAME getrpcbynumber
|
||||
#define DATABASE_NAME rpc
|
||||
#define ADD_PARAMS int number
|
||||
#define ADD_VARIABLES number
|
||||
#define BUFLEN 1024
|
||||
|
||||
/* There is no nscd support for the rpc file. */
|
||||
#undef USE_NSCD
|
||||
|
||||
#include "../nss/getXXbyYY.c"
|
||||
30
nss/getrpcbynumber_r.c
Normal file
30
nss/getrpcbynumber_r.c
Normal file
@@ -0,0 +1,30 @@
|
||||
/* Copyright (C) 1996-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/>. */
|
||||
|
||||
#include <rpc/netdb.h>
|
||||
|
||||
|
||||
#define LOOKUP_TYPE struct rpcent
|
||||
#define FUNCTION_NAME getrpcbynumber
|
||||
#define DATABASE_NAME rpc
|
||||
#define ADD_PARAMS int number
|
||||
#define ADD_VARIABLES number
|
||||
|
||||
/* There is no nscd support for the rpc file. */
|
||||
#undef USE_NSCD
|
||||
|
||||
#include "../nss/getXXbyYY_r.c"
|
||||
28
nss/getrpcent.c
Normal file
28
nss/getrpcent.c
Normal file
@@ -0,0 +1,28 @@
|
||||
/* Copyright (C) 1996-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/>. */
|
||||
|
||||
#include <rpc/netdb.h>
|
||||
|
||||
|
||||
#define LOOKUP_TYPE struct rpcent
|
||||
#define GETFUNC_NAME getrpcent
|
||||
#define BUFLEN 1024
|
||||
|
||||
/* There is no nscd support for the rpc file. */
|
||||
#undef USE_NSCD
|
||||
|
||||
#include "../nss/getXXent.c"
|
||||
32
nss/getrpcent_r.c
Normal file
32
nss/getrpcent_r.c
Normal file
@@ -0,0 +1,32 @@
|
||||
/* Copyright (C) 1996-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/>. */
|
||||
|
||||
#include <netdb.h>
|
||||
|
||||
|
||||
#define LOOKUP_TYPE struct rpcent
|
||||
#define SETFUNC_NAME setrpcent
|
||||
#define GETFUNC_NAME getrpcent
|
||||
#define ENDFUNC_NAME endrpcent
|
||||
#define DATABASE_NAME rpc
|
||||
#define STAYOPEN int stayopen
|
||||
#define STAYOPEN_VAR stayopen
|
||||
|
||||
/* There is no nscd support for the rpc file. */
|
||||
#undef USE_NSCD
|
||||
|
||||
#include "../nss/getXXent_r.c"
|
||||
74
nss/test-rpcent.c
Normal file
74
nss/test-rpcent.c
Normal file
@@ -0,0 +1,74 @@
|
||||
/* 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"
|
||||
Reference in New Issue
Block a user