From: Carlos O'Donell via Libc-alpha <libc-alpha@sourceware.org>
To: Florian Weimer <fweimer@redhat.com>, libc-alpha@sourceware.org
Subject: Re: [PATCH 25/30] resolv: Move res_hostalias into its own file, along with hostalias
Date: Thu, 15 Jul 2021 01:02:15 -0400 [thread overview]
Message-ID: <fad44e75-b567-5eef-dae2-7819ce4ae2ef@redhat.com> (raw)
In-Reply-To: <2859cbe6705cdc430d0d5e200224e5e9503eea86.1625755446.git.fweimer@redhat.com>
On 7/8/21 11:06 AM, Florian Weimer via Libc-alpha wrote:
> These deprecated symbols continue to be exported from libresolv.
OK for glibc 2.34.
Tested without regression on x86_64 and i686.
Reviewed-by: Carlos O'Donell <carlos@redhat.com>
Tested-by: Carlos O'Donell <carlos@redhat.com>
> ---
> resolv/Makefile | 1 +
> resolv/res_hostalias.c | 51 ++++++++++++++++++++++++++++++++++++++++++
> resolv/res_query.c | 30 -------------------------
> 3 files changed, 52 insertions(+), 30 deletions(-)
> create mode 100644 resolv/res_hostalias.c
>
> diff --git a/resolv/Makefile b/resolv/Makefile
> index bfcca70f26..8c28afe5c4 100644
> --- a/resolv/Makefile
> +++ b/resolv/Makefile
> @@ -152,6 +152,7 @@ libresolv-routines := \
> res_data \
> res_debug \
> res_enable_icmp \
> + res_hostalias \
OK.
> res_isourserver \
> res_mkquery \
> res_query \
> diff --git a/resolv/res_hostalias.c b/resolv/res_hostalias.c
> new file mode 100644
> index 0000000000..d364725677
> --- /dev/null
> +++ b/resolv/res_hostalias.c
> @@ -0,0 +1,51 @@
> +/* HOSTALIASES-based name resolution. Public legacy functions.
OK.
> + Copyright (C) 2017-2021 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>
> +#include <resolv-internal.h>
> +#include <resolv_context.h>
> +
> +/* Common part of res_hostalias and hostalias. */
> +static const char *
> +context_hostalias_common (struct resolv_context *ctx,
> + const char *name, char *dst, size_t siz)
> +{
> + if (ctx == NULL)
> + {
> + RES_SET_H_ERRNO (&_res, NETDB_INTERNAL);
> + return NULL;
> + }
> + const char *result = __res_context_hostalias (ctx, name, dst, siz);
> + __resolv_context_put (ctx);
> + return result;
OK.
> +}
> +
> +const char *
> +res_hostalias (res_state statp, const char *name, char *dst, size_t siz)
> +{
> + return context_hostalias_common
> + (__resolv_context_get_override (statp), name, dst, siz);
OK.
> +}
> +
> +const char *
> +hostalias (const char *name)
> +{
> + static char abuf[MAXDNAME];
> + return context_hostalias_common
> + (__resolv_context_get (), name, abuf, sizeof (abuf));
OK.
> +}
> diff --git a/resolv/res_query.c b/resolv/res_query.c
> index 45c591ae27..2457193d31 100644
> --- a/resolv/res_query.c
> +++ b/resolv/res_query.c
> @@ -635,36 +635,6 @@ res_querydomain (const char *name, const char *domain, int class, int type,
> (__resolv_context_get (), name, domain, class, type, answer, anslen);
> }
>
> -/* Common part of res_hostalias and hostalias. */
> -static const char *
> -context_hostalias_common (struct resolv_context *ctx,
> - const char *name, char *dst, size_t siz)
> -{
> - if (ctx == NULL)
> - {
> - RES_SET_H_ERRNO (&_res, NETDB_INTERNAL);
> - return NULL;
> - }
> - const char *result = __res_context_hostalias (ctx, name, dst, siz);
> - __resolv_context_put (ctx);
> - return result;
> -}
OK. Remove.
> -
> -const char *
> -res_hostalias (res_state statp, const char *name, char *dst, size_t siz)
> -{
> - return context_hostalias_common
> - (__resolv_context_get_override (statp), name, dst, siz);
> -}
OK. Remove.
> -
> -const char *
> -hostalias (const char *name)
> -{
> - static char abuf[MAXDNAME];
> - return context_hostalias_common
> - (__resolv_context_get (), name, abuf, sizeof (abuf));
> -}
> -
OK. Remove.
> #if SHLIB_COMPAT (libresolv, GLIBC_2_0, GLIBC_2_2)
> # undef res_query
> # undef res_querydomain
>
--
Cheers,
Carlos.
next prev parent reply other threads:[~2021-07-15 5:19 UTC|newest]
Thread overview: 70+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-07-08 14:59 [PATCH v2 00/30] nss_dns move into libc Florian Weimer via Libc-alpha
2021-07-08 14:59 ` [PATCH 01/30] socket: Add hidden prototype for setsockopt Florian Weimer via Libc-alpha
2021-07-08 18:02 ` Adhemerval Zanella via Libc-alpha
2021-07-15 4:59 ` Carlos O'Donell via Libc-alpha
2021-07-08 14:59 ` [PATCH 02/30] resolv: Deprecate legacy interfaces in <resolv.h> Florian Weimer via Libc-alpha
2021-07-08 18:32 ` Adhemerval Zanella via Libc-alpha
2021-07-15 4:59 ` Carlos O'Donell via Libc-alpha
2021-07-08 14:59 ` [PATCH 03/30] resolv: Sort Makefile routines and Versions lexicographically Florian Weimer via Libc-alpha
2021-07-08 18:33 ` Adhemerval Zanella via Libc-alpha
2021-07-15 4:59 ` Carlos O'Donell via Libc-alpha
2021-07-08 15:00 ` [PATCH 04/30] nss_dns: Do not use deprecated packet parsing functions Florian Weimer via Libc-alpha
2021-07-15 5:00 ` Carlos O'Donell via Libc-alpha
2021-07-08 15:00 ` [PATCH 05/30] resolv: Move ns_name_ntop to its own file and into libc Florian Weimer via Libc-alpha
2021-07-15 5:00 ` Carlos O'Donell via Libc-alpha
2021-07-08 15:00 ` [PATCH 06/30] resolv: Move ns_name_unpack " Florian Weimer via Libc-alpha
2021-07-15 5:00 ` Carlos O'Donell via Libc-alpha
2021-07-08 15:00 ` [PATCH 07/30] resolv: Move ns_name_skip " Florian Weimer via Libc-alpha
2021-07-15 5:00 ` Carlos O'Donell via Libc-alpha
2021-07-15 6:53 ` Florian Weimer via Libc-alpha
2021-07-08 15:00 ` [PATCH 08/30] resolv: Move ns_name_uncompress into " Florian Weimer via Libc-alpha
2021-07-15 5:00 ` Carlos O'Donell via Libc-alpha
2021-07-08 15:01 ` [PATCH 09/30] resolv: Move ns_name_pton " Florian Weimer via Libc-alpha
2021-07-15 5:00 ` Carlos O'Donell via Libc-alpha
2021-07-08 15:01 ` [PATCH 10/30] resolv: Move ns_name_pack " Florian Weimer via Libc-alpha
2021-07-15 5:00 ` Carlos O'Donell via Libc-alpha
2021-07-08 15:01 ` [PATCH 11/30] resolv: Move ns_name_compress " Florian Weimer via Libc-alpha
2021-07-15 5:01 ` Carlos O'Donell via Libc-alpha
2021-07-08 15:02 ` [PATCH 12/30] resolv: Move dn_expand to " Florian Weimer via Libc-alpha
2021-07-15 5:01 ` Carlos O'Donell via Libc-alpha
2021-07-08 15:02 ` [PATCH 13/30] resolv: Move _getlong, _getshort, __putlong, __putshort to res-putget Florian Weimer via Libc-alpha
2021-07-15 5:01 ` Carlos O'Donell via Libc-alpha
2021-07-08 15:03 ` [PATCH 14/30] resolv: Move dn_comp to its own file and into libc Florian Weimer via Libc-alpha
2021-07-15 5:01 ` Carlos O'Donell via Libc-alpha
2021-07-08 15:03 ` [PATCH 15/30] resolv: Move dn_skipname " Florian Weimer via Libc-alpha
2021-07-15 5:01 ` Carlos O'Donell via Libc-alpha
2021-07-08 15:03 ` [PATCH 16/30] resolv: Rename res_comp.c to res-name-checking.c and move " Florian Weimer via Libc-alpha
2021-07-15 5:01 ` Carlos O'Donell via Libc-alpha
2021-07-08 15:04 ` [PATCH 17/30] resolv: Remove unnecessary res_isourserver_p call from send_dg Florian Weimer via Libc-alpha
2021-07-15 5:01 ` Carlos O'Donell via Libc-alpha
2021-07-08 15:04 ` [PATCH 18/30] resolv: Move __res_get_nsaddr to its own file and into libc Florian Weimer via Libc-alpha
2021-07-15 5:01 ` Carlos O'Donell via Libc-alpha
2021-07-08 15:05 ` [PATCH 19/30] resolv: Move res_isourserver to its own file and reformat to GNU style Florian Weimer via Libc-alpha
2021-07-15 5:01 ` Carlos O'Donell via Libc-alpha
2021-07-08 15:05 ` [PATCH 20/30] resolv: Move ns_makecanon into its own file, and into libc Florian Weimer via Libc-alpha
2021-07-15 5:01 ` Carlos O'Donell via Libc-alpha
2021-07-08 15:05 ` [PATCH 21/30] resolv: Move ns_samename " Florian Weimer via Libc-alpha
2021-07-15 5:01 ` Carlos O'Donell via Libc-alpha
2021-07-08 15:05 ` [PATCH 22/30] resolv: Move res_nameinquery to its own file " Florian Weimer via Libc-alpha
2021-07-15 5:01 ` Carlos O'Donell via Libc-alpha
2021-07-08 15:06 ` [PATCH 23/30] resolv: Move res_queriesmatch " Florian Weimer via Libc-alpha
2021-07-15 5:02 ` Carlos O'Donell via Libc-alpha
2021-07-08 15:06 ` [PATCH 24/30] resolv: Move __res_context_hostalias into " Florian Weimer via Libc-alpha
2021-07-15 5:02 ` Carlos O'Donell via Libc-alpha
2021-07-08 15:06 ` [PATCH 25/30] resolv: Move res_hostalias into its own file, along with hostalias Florian Weimer via Libc-alpha
2021-07-15 5:02 ` Carlos O'Donell via Libc-alpha [this message]
2021-07-08 15:06 ` [PATCH 26/30] resolv: Move res_send, res_nsend into libc Florian Weimer via Libc-alpha
2021-07-15 5:02 ` Carlos O'Donell via Libc-alpha
2021-07-08 15:06 ` [PATCH 27/30] resolv: Move res_mkquery, res_nmkquery " Florian Weimer via Libc-alpha
2021-07-15 5:02 ` Carlos O'Donell via Libc-alpha
2021-07-08 15:07 ` [PATCH 28/30] resolv: Move res_query functions " Florian Weimer via Libc-alpha
2021-07-15 5:02 ` Carlos O'Donell via Libc-alpha
2021-07-08 15:07 ` [PATCH 29/30] resolv: Move nss_dns " Florian Weimer via Libc-alpha
2021-07-15 5:02 ` Carlos O'Donell via Libc-alpha
2021-07-08 15:07 ` [PATCH 30/30] nss: Directly load nss_dns, without going through dlsym/dlopen Florian Weimer via Libc-alpha
2021-07-08 15:42 ` Florian Weimer via Libc-alpha
2021-07-15 5:02 ` Carlos O'Donell via Libc-alpha
2021-07-15 7:09 ` Florian Weimer via Libc-alpha
2021-07-15 12:21 ` Carlos O'Donell via Libc-alpha
2021-07-15 4:58 ` [PATCH v2 00/30] nss_dns move into libc Carlos O'Donell via Libc-alpha
-- strict thread matches above, loose matches on Subject: below --
2021-07-02 18:47 [PATCH 00/30] Move nss_dns " Florian Weimer via Libc-alpha
2021-07-02 18:49 ` [PATCH 25/30] resolv: Move res_hostalias into its own file, along with hostalias Florian Weimer via Libc-alpha
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
List information: https://www.gnu.org/software/libc/involved.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=fad44e75-b567-5eef-dae2-7819ce4ae2ef@redhat.com \
--to=libc-alpha@sourceware.org \
--cc=carlos@redhat.com \
--cc=fweimer@redhat.com \
/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).