inet: Turn __ivaliduser into a compatibility symbol

It is not declared in a header file, and as the comment indicates,
it is not expected to be used.
This commit is contained in:
Florian Weimer 2022-08-10 08:35:41 +02:00
parent 312ded0d63
commit 2ed26bca99
2 changed files with 8 additions and 13 deletions

View File

@ -79,6 +79,7 @@
#include <wchar.h> #include <wchar.h>
#include <sys/uio.h> #include <sys/uio.h>
#include <sigsetops.h> #include <sigsetops.h>
#include <shlib-compat.h>
int __ivaliduser (FILE *, uint32_t, const char *, const char *); int __ivaliduser (FILE *, uint32_t, const char *, const char *);
@ -621,18 +622,9 @@ iruserok (uint32_t raddr, int superuser, const char *ruser, const char *luser)
return iruserok_af (&raddr, superuser, ruser, luser, AF_INET); return iruserok_af (&raddr, superuser, ruser, luser, AF_INET);
} }
/* #if SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_37)
* XXX /* Previously used by lpd. Current lpd versions have their own copy. */
* Don't make static, used by lpd(8). int attribute_compat_text_section
*
* This function is not used anymore. It is only present because lpd(8)
* calls it (!?!). We simply call __invaliduser2() with an illegal rhost
* argument. This means that netgroups won't work in .rhost/hosts.equiv
* files. If you want lpd to work with netgroups, fix lpd to use ruserok()
* or PAM.
* Returns 0 if ok, -1 if not ok.
*/
int
__ivaliduser (FILE *hostf, uint32_t raddr, const char *luser, __ivaliduser (FILE *hostf, uint32_t raddr, const char *luser,
const char *ruser) const char *ruser)
{ {
@ -643,7 +635,8 @@ __ivaliduser (FILE *hostf, uint32_t raddr, const char *luser,
return __validuser2_sa(hostf, (struct sockaddr *)&ra, sizeof(ra), return __validuser2_sa(hostf, (struct sockaddr *)&ra, sizeof(ra),
luser, ruser, "-"); luser, ruser, "-");
} }
compat_symbol (libc, __ivaliduser, __ivaliduser, GLIBC_2_0);
#endif
/* Returns 1 on positive match, 0 on no match, -1 on negative match. */ /* Returns 1 on positive match, 0 on no match, -1 on negative match. */
static int static int

View File

@ -141,6 +141,8 @@ libc {
arc4random_buf; arc4random_buf;
arc4random_uniform; arc4random_uniform;
} }
GLIBC_2.37 {
}
GLIBC_PRIVATE { GLIBC_PRIVATE {
# functions which have an additional interface since they are # functions which have an additional interface since they are
# are cancelable. # are cancelable.