From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: AS17314 8.43.84.0/22 X-Spam-Status: No, score=-3.8 required=3.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,MAILING_LIST_MULTI, PDS_RDNS_DYNAMIC_FP,RCVD_IN_DNSWL_HI,RDNS_DYNAMIC,SPF_HELO_PASS, SPF_PASS shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from sourceware.org (ip-8-43-85-97.sourceware.org [8.43.85.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by dcvr.yhbt.net (Postfix) with ESMTPS id 3037F1F8C6 for ; Thu, 15 Jul 2021 09:25:56 +0000 (UTC) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 3D5133AAAC08 for ; Thu, 15 Jul 2021 09:25:55 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 3D5133AAAC08 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1626341155; bh=sqCleBd+bUaxrYm+btkBkG6/BgGKWBgROKTCzTJcb6s=; 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=AVkHd7AT7jTw39qW6VZVEvXuKcoyxLN56QnMlhm4oKfnpDoPSVt6Hv0BRqEs2YeuS 6V6pGe4c+5XaklECcMI1/13Y7BU6TTCUfLwIH54A+mk7UHZKpaU8TuLSEoj6VoUyOO aFSPTRg5Y3G+sVF4L53wsIR9448Z8Ek5YjdULdMM= 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 087B63AAA080 for ; Thu, 15 Jul 2021 09:10:42 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 087B63AAA080 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-533-q6FNPFXZOBKu9x38rOlrdg-1; Thu, 15 Jul 2021 05:10:40 -0400 X-MC-Unique: q6FNPFXZOBKu9x38rOlrdg-1 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 750DC180209F for ; Thu, 15 Jul 2021 09:10:39 +0000 (UTC) Received: from oldenburg.str.redhat.com (ovpn-112-73.phx2.redhat.com [10.3.112.73]) by smtp.corp.redhat.com (Postfix) with ESMTPS id B008560583 for ; Thu, 15 Jul 2021 09:10:38 +0000 (UTC) To: libc-alpha@sourceware.org Subject: [PATCH 19/24] resolv: Move res_hostalias into its own file, along with hostalias In-Reply-To: References: X-From-Line: 82fd7fe892ce9a8b20da5767fe0b1fd92b12a408 Mon Sep 17 00:00:00 2001 Message-Id: <82fd7fe892ce9a8b20da5767fe0b1fd92b12a408.1626339931.git.fweimer@redhat.com> Date: Thu, 15 Jul 2021 11:10:36 +0200 User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain 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: , From: Florian Weimer via Libc-alpha Reply-To: Florian Weimer Errors-To: libc-alpha-bounces+e=80x24.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 -- 2.31.1