From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <fw@sourceware.org>
Received: by sourceware.org (Postfix, from userid 2178)
 id 453C13857C40; Wed, 10 Aug 2022 07:53:36 +0000 (GMT)
DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 453C13857C40
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: Florian Weimer <fw@sourceware.org>
To: glibc-cvs@sourceware.org
Subject: [glibc] inet: Turn __ivaliduser into a compatibility symbol
X-Act-Checkin: glibc
X-Git-Author: Florian Weimer <fweimer@redhat.com>
X-Git-Refname: refs/heads/master
X-Git-Oldrev: 312ded0d6339e8c463d0395397b5825401b14f54
X-Git-Newrev: 2ed26bca997a8fc898f4cb94484abaee2f307311
Message-Id: <20220810075336.453C13857C40@sourceware.org>
Date: Wed, 10 Aug 2022 07:53:36 +0000 (GMT)
X-BeenThere: glibc-cvs@sourceware.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: Glibc-cvs mailing list <glibc-cvs.sourceware.org>
List-Unsubscribe: <https://sourceware.org/mailman/options/glibc-cvs>,
 <mailto:glibc-cvs-request@sourceware.org?subject=unsubscribe>
List-Archive: <https://sourceware.org/pipermail/glibc-cvs/>
List-Help: <mailto:glibc-cvs-request@sourceware.org?subject=help>
List-Subscribe: <https://sourceware.org/mailman/listinfo/glibc-cvs>,
 <mailto:glibc-cvs-request@sourceware.org?subject=subscribe>
X-List-Received-Date: Wed, 10 Aug 2022 07:53:36 -0000

https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=2ed26bca997a8fc898f4cb94484abaee2f307311

commit 2ed26bca997a8fc898f4cb94484abaee2f307311
Author: Florian Weimer <fweimer@redhat.com>
Date:   Wed Aug 10 08:35:41 2022 +0200

    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.

Diff:
---
 inet/rcmd.c     | 19 ++++++-------------
 stdlib/Versions |  2 ++
 2 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/inet/rcmd.c b/inet/rcmd.c
index 0d6b595572..2b95fa11d8 100644
--- a/inet/rcmd.c
+++ b/inet/rcmd.c
@@ -79,6 +79,7 @@
 #include <wchar.h>
 #include <sys/uio.h>
 #include <sigsetops.h>
+#include <shlib-compat.h>
 
 
 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);
 }
 
-/*
- * XXX
- * Don't make static, used by lpd(8).
- *
- * 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
+#if SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_37)
+/* Previously used by lpd.  Current lpd versions have their own copy.  */
+int attribute_compat_text_section
 __ivaliduser (FILE *hostf, uint32_t raddr, const char *luser,
 	      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),
 			       luser, ruser, "-");
 }
-
+compat_symbol (libc, __ivaliduser, __ivaliduser, GLIBC_2_0);
+#endif
 
 /* Returns 1 on positive match, 0 on no match, -1 on negative match.  */
 static int
diff --git a/stdlib/Versions b/stdlib/Versions
index d09a308fb5..ebc43263d6 100644
--- a/stdlib/Versions
+++ b/stdlib/Versions
@@ -141,6 +141,8 @@ libc {
     arc4random_buf;
     arc4random_uniform;
   }
+  GLIBC_2.37 {
+  }
   GLIBC_PRIVATE {
     # functions which have an additional interface since they are
     # are cancelable.