From patchwork Thu Jul 8 15:06:29 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Weimer X-Patchwork-Id: 44246 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 589FA39DC4FD for ; Thu, 8 Jul 2021 15:22:27 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 589FA39DC4FD DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1625757747; bh=QC7h6vNhlN1W+57swV0zzxqth3kCaC6hJJuOeGi0nIA=; h=To:Subject:In-Reply-To:References:Date:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To: From; b=u8yAim0YVsFJnEXzbbtUfflZ1hTxrhAV5wtQL8pEkgmc/tWoQH5R7bOXAHJ9HKvrA LaHH00mjy7EcUd08N+gKrqauPLLD5scmMhHyP8DIi+6v3RrkCWZ3kBXwznfepEpPPj vkFDLWewraUwmyiZRClcY381Hih4ksArm608q204= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by sourceware.org (Postfix) with ESMTP id 0725E39960C5 for ; Thu, 8 Jul 2021 15:06:39 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 0725E39960C5 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-449-h3k2wLhiNXC7C2sUL4y1TA-1; Thu, 08 Jul 2021 11:06:37 -0400 X-MC-Unique: h3k2wLhiNXC7C2sUL4y1TA-1 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id F12A08030B0 for ; Thu, 8 Jul 2021 15:06:36 +0000 (UTC) Received: from oldenburg.str.redhat.com (ovpn-115-5.ams2.redhat.com [10.36.115.5]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 4EE7B10023AB for ; Thu, 8 Jul 2021 15:06:35 +0000 (UTC) To: libc-alpha@sourceware.org Subject: [PATCH 25/30] resolv: Move res_hostalias into its own file, along with hostalias In-Reply-To: References: X-From-Line: 2859cbe6705cdc430d0d5e200224e5e9503eea86 Mon Sep 17 00:00:00 2001 Message-Id: <2859cbe6705cdc430d0d5e200224e5e9503eea86.1625755446.git.fweimer@redhat.com> Date: Thu, 08 Jul 2021 17:06:29 +0200 User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-12.8 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, KAM_SHORT, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_NONE, TXREP autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Florian Weimer via Libc-alpha From: Florian Weimer Reply-To: Florian Weimer Errors-To: libc-alpha-bounces+patchwork=sourceware.org@sourceware.org Sender: "Libc-alpha" These deprecated symbols continue to be exported from libresolv. Reviewed-by: Carlos O'Donell Tested-by: Carlos O'Donell --- 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 + . */ + +#include +#include +#include + +/* 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