From: Siddhesh Poyarekar <siddhesh@sourceware.org>
To: libc-stable@sourceware.org
Subject: [pushed 2.34 02/14] gethosts: Remove unused argument _type
Date: Fri, 15 Sep 2023 20:48:49 -0400 [thread overview]
Message-ID: <20230916004902.1151607-3-siddhesh@sourceware.org> (raw)
In-Reply-To: <20230916004902.1151607-1-siddhesh@sourceware.org>
The generated code is unchanged.
(cherry picked from commit b17e842a60819098d2a203ecc8b8371b7e1d6c65)
---
sysdeps/posix/getaddrinfo.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/sysdeps/posix/getaddrinfo.c b/sysdeps/posix/getaddrinfo.c
index f391dc0a59..702d8a50e0 100644
--- a/sysdeps/posix/getaddrinfo.c
+++ b/sysdeps/posix/getaddrinfo.c
@@ -239,7 +239,7 @@ convert_hostent_to_gaih_addrtuple (const struct addrinfo *req,
return true;
}
-#define gethosts(_family, _type) \
+#define gethosts(_family) \
{ \
struct hostent th; \
char *localcanon = NULL; \
@@ -864,7 +864,7 @@ gaih_inet (const char *name, const struct gaih_service *service,
if (req->ai_family == AF_INET6
|| req->ai_family == AF_UNSPEC)
{
- gethosts (AF_INET6, struct in6_addr);
+ gethosts (AF_INET6);
no_inet6_data = no_data;
inet6_status = status;
}
@@ -876,7 +876,7 @@ gaih_inet (const char *name, const struct gaih_service *service,
know we are not going to need them. */
&& ((req->ai_flags & AI_ALL) || !got_ipv6)))
{
- gethosts (AF_INET, struct in_addr);
+ gethosts (AF_INET);
if (req->ai_family == AF_INET)
{
--
2.41.0
next prev parent reply other threads:[~2023-09-16 0:49 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-09-16 0:48 [pushed 2.34 00/14] Backport gaih_inet refactoring and CVE fix Siddhesh Poyarekar
2023-09-16 0:48 ` [pushed 2.34 01/14] nss: Sort tests and tests-container and put one test per line Siddhesh Poyarekar
2023-09-16 0:48 ` Siddhesh Poyarekar [this message]
2023-09-16 0:48 ` [pushed 2.34 03/14] gaih_inet: Simplify canon name resolution Siddhesh Poyarekar
2023-09-16 0:48 ` [pushed 2.34 04/14] getaddrinfo: Fix leak with AI_ALL [BZ #28852] Siddhesh Poyarekar
2023-09-16 0:48 ` [pushed 2.34 05/14] gaih_inet: Simplify service resolution Siddhesh Poyarekar
2023-09-16 0:48 ` [pushed 2.34 06/14] gaih_inet: make numeric lookup a separate routine Siddhesh Poyarekar
2023-09-16 0:48 ` [pushed 2.34 07/14] gaih_inet: Split simple gethostbyname into its own function Siddhesh Poyarekar
2023-09-16 0:48 ` [pushed 2.34 08/14] gaih_inet: Split nscd lookup code " Siddhesh Poyarekar
2023-09-16 0:48 ` [pushed 2.34 09/14] gaih_inet: separate nss lookup loop " Siddhesh Poyarekar
2023-09-16 0:48 ` [pushed 2.34 10/14] gaih_inet: make gethosts into a function Siddhesh Poyarekar
2023-09-16 0:48 ` [pushed 2.34 11/14] gaih_inet: split loopback lookup into its own function Siddhesh Poyarekar
2023-09-16 0:48 ` [pushed 2.34 12/14] gaih_inet: Split result generation " Siddhesh Poyarekar
2023-09-16 0:49 ` [pushed 2.34 13/14] gethosts: Return EAI_MEMORY on allocation failure Siddhesh Poyarekar
2023-09-16 0:49 ` [pushed 2.34 14/14] getaddrinfo: Fix use after free in getcanonname (CVE-2023-4806) Siddhesh Poyarekar
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230916004902.1151607-3-siddhesh@sourceware.org \
--to=siddhesh@sourceware.org \
--cc=libc-stable@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).