From: Florian Weimer <fweimer@redhat.com>
To: libc-alpha@sourceware.org
Subject: [PATCH 19/24] resolv: Move res_hostalias into its own file, along with hostalias
Date: Thu, 15 Jul 2021 11:10:36 +0200 [thread overview]
Message-ID: <82fd7fe892ce9a8b20da5767fe0b1fd92b12a408.1626339931.git.fweimer@redhat.com> (raw)
In-Reply-To: <cover.1626339931.git.fweimer@redhat.com>
These deprecated symbols continue to be exported from libresolv.
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 \
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.
+ 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;
+}
+
+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);
+}
+
+const char *
+hostalias (const char *name)
+{
+ static char abuf[MAXDNAME];
+ return context_hostalias_common
+ (__resolv_context_get (), name, abuf, sizeof (abuf));
+}
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;
-}
-
-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);
-}
-
-const char *
-hostalias (const char *name)
-{
- static char abuf[MAXDNAME];
- return context_hostalias_common
- (__resolv_context_get (), name, abuf, sizeof (abuf));
-}
-
#if SHLIB_COMPAT (libresolv, GLIBC_2_0, GLIBC_2_2)
# undef res_query
# undef res_querydomain
--
2.31.1
next prev parent reply other threads:[~2021-07-15 9:10 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-07-15 9:08 [PATCH v3 00/24] Move nss_dns and parts of libresolv into libc Florian Weimer
2021-07-15 9:09 ` [PATCH 01/24] resolv: Deprecate legacy interfaces in libresolv Florian Weimer
2021-07-15 9:30 ` Andreas Schwab
2021-07-15 9:32 ` Florian Weimer
2021-07-19 1:48 ` Carlos O'Donell
2021-07-15 9:09 ` [PATCH 02/24] resolv: Move ns_name_skip to its own file and into libc (bug 28091) Florian Weimer
2021-07-19 1:52 ` Carlos O'Donell
2021-07-15 9:09 ` [PATCH 03/24] resolv: Move ns_name_uncompress into its own file and into libc Florian Weimer
2021-07-15 9:09 ` [PATCH 04/24] resolv: Move ns_name_pton " Florian Weimer
2021-07-15 9:09 ` [PATCH 05/24] resolv: Move ns_name_pack " Florian Weimer
2021-07-15 9:09 ` [PATCH 06/24] resolv: Move ns_name_compress " Florian Weimer
2021-07-15 9:09 ` [PATCH 07/24] resolv: Move dn_expand to " Florian Weimer
2021-07-15 9:09 ` [PATCH 08/24] resolv: Move _getlong, _getshort, __putlong, __putshort to res-putget Florian Weimer
2021-07-15 9:09 ` [PATCH 09/24] resolv: Move dn_comp to its own file and into libc Florian Weimer
2021-07-15 9:09 ` [PATCH 10/24] resolv: Move dn_skipname " Florian Weimer
2021-07-15 9:09 ` [PATCH 11/24] resolv: Rename res_comp.c to res-name-checking.c and move " Florian Weimer
2021-07-15 9:10 ` [PATCH 12/24] resolv: Move __res_get_nsaddr to its own file and " Florian Weimer
2021-07-15 9:10 ` [PATCH 13/24] resolv: Move res_isourserver to its own file and reformat to GNU style Florian Weimer
2021-07-15 9:10 ` [PATCH 14/24] resolv: Move ns_makecanon into its own file, and into libc Florian Weimer
2021-07-15 9:10 ` [PATCH 15/24] resolv: Move ns_samename " Florian Weimer
2021-07-15 9:10 ` [PATCH 16/24] resolv: Move res_nameinquery to its own file " Florian Weimer
2021-07-15 9:10 ` [PATCH 17/24] resolv: Move res_queriesmatch " Florian Weimer
2021-07-15 9:10 ` [PATCH 18/24] resolv: Move __res_context_hostalias into " Florian Weimer
2021-07-15 9:10 ` Florian Weimer [this message]
2021-07-15 9:10 ` [PATCH 20/24] resolv: Move res_send, res_nsend " Florian Weimer
2021-07-19 1:54 ` Carlos O'Donell
2021-07-15 9:10 ` [PATCH 21/24] resolv: Move res_mkquery, res_nmkquery " Florian Weimer
2021-07-15 9:10 ` [PATCH 22/24] resolv: Move res_query functions " Florian Weimer
2021-07-21 9:54 ` Andreas Schwab
2021-07-21 10:16 ` Florian Weimer
2021-07-15 9:10 ` [PATCH 23/24] resolv: Move nss_dns " Florian Weimer
2021-07-15 9:11 ` [PATCH 24/24] nss: Directly load nss_dns, without going through dlsym/dlopen Florian Weimer
2021-07-20 9:17 ` [PATCH v3 00/24] Move nss_dns and parts of libresolv into libc Andreas Schwab
2021-07-20 10:26 ` Florian Weimer
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=82fd7fe892ce9a8b20da5767fe0b1fd92b12a408.1626339931.git.fweimer@redhat.com \
--to=fweimer@redhat.com \
--cc=libc-alpha@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).