From patchwork Thu Jul 15 09:10:12 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Weimer X-Patchwork-Id: 44360 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 5CA653AAA0DE for ; Thu, 15 Jul 2021 09:22:02 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 5CA653AAA0DE DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1626340922; bh=3jEGutqtvgfBtsrkccwVoP5A4rUhluLOTkwmLIXXlxY=; 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=rnv6q41P7O7igiJhfNh4wDNA95WolLYSiEMd3z8gkz3NLuVrY4G5aW4nRkwWXLDhm Dy/3tYfxkFFcl/0RJjH/U/IdYetQ2Zcl7QpiimWhpRf2AYyOVhhdwO008qiOVmS5ir 6odfYp53qr5cu20Ercs2htVyUVYMdttHMQOObCBE= 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 8B2543AA9C7B for ; Thu, 15 Jul 2021 09:10:18 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 8B2543AA9C7B 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-303-2TpPxfscNMSxGsRdGan61g-1; Thu, 15 Jul 2021 05:10:16 -0400 X-MC-Unique: 2TpPxfscNMSxGsRdGan61g-1 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 0345E10051A5 for ; Thu, 15 Jul 2021 09:10:16 +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 28FD160871 for ; Thu, 15 Jul 2021 09:10:14 +0000 (UTC) To: libc-alpha@sourceware.org Subject: [PATCH 14/24] resolv: Move ns_makecanon into its own file, and into libc In-Reply-To: References: X-From-Line: aca9eb775b74e57c6b588ac0b6e09efada3349a4 Mon Sep 17 00:00:00 2001 Message-Id: Date: Thu, 15 Jul 2021 11:10:12 +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.13 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-12.9 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" But only as an internal symbol, __libc_ns_makecanon. The libresolv ABI is preserved. This is because the function is deprecated, and it does not make sense to add new symbol versions for deprecated functions. Also reformat the implementation to GNU style. Reviewed-by: Carlos O'Donell Tested-by: Carlos O'Donell --- include/arpa/nameser.h | 3 ++- resolv/Makefile | 2 ++ resolv/Versions | 1 + resolv/ns_makecanon.c | 50 ++++++++++++++++++++++++++++++++++++++ resolv/ns_samedomain.c | 38 ++--------------------------- resolv/resolv-deprecated.c | 35 ++++++++++++++++++++++++++ 6 files changed, 92 insertions(+), 37 deletions(-) create mode 100644 resolv/ns_makecanon.c create mode 100644 resolv/resolv-deprecated.c diff --git a/include/arpa/nameser.h b/include/arpa/nameser.h index eff25178c8..a529cc86d3 100644 --- a/include/arpa/nameser.h +++ b/include/arpa/nameser.h @@ -69,9 +69,10 @@ libresolv_hidden_proto (ns_sprintrr) libresolv_hidden_proto (ns_sprintrrf) libresolv_hidden_proto (ns_samedomain) libresolv_hidden_proto (ns_samename) -libresolv_hidden_proto (ns_makecanon) libresolv_hidden_proto (ns_format_ttl) +extern __typeof (ns_makecanon) __libc_ns_makecanon; +libc_hidden_proto (__libc_ns_makecanon) extern __typeof (ns_name_compress) __ns_name_compress; libc_hidden_proto (__ns_name_compress) extern __typeof (ns_name_ntop) __ns_name_ntop; diff --git a/resolv/Makefile b/resolv/Makefile index 221bdc153d..d1ad5e4cba 100644 --- a/resolv/Makefile +++ b/resolv/Makefile @@ -35,6 +35,7 @@ routines := \ inet_addr \ inet_ntop \ inet_pton \ + ns_makecanon \ ns_name_compress \ ns_name_ntop \ ns_name_pack \ @@ -151,6 +152,7 @@ libresolv-routines := \ res_mkquery \ res_query \ res_send \ + resolv-deprecated \ # libresolv-routines $(libanl-routines-var) += \ diff --git a/resolv/Versions b/resolv/Versions index fc14cdb701..93078de25c 100644 --- a/resolv/Versions +++ b/resolv/Versions @@ -72,6 +72,7 @@ libc { __inet_pton_length; __libc_dn_expand; __libc_dn_skipname; + __libc_ns_makecanon; __libc_res_dnok; __libc_res_hnok; __ns_name_compress; diff --git a/resolv/ns_makecanon.c b/resolv/ns_makecanon.c new file mode 100644 index 0000000000..a6c3c2737d --- /dev/null +++ b/resolv/ns_makecanon.c @@ -0,0 +1,50 @@ +/* Add missing "." to domain names. + * Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC") + * Copyright (c) 1995,1999 by Internet Software Consortium. + * + * Permission to use, copy, modify, and distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM DISCLAIMS + * ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE + * CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL + * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR + * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS + * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS + * SOFTWARE. + */ + +#include +#include +#include + +/* Make a canonical copy of domain name SRC in DST. Behavior: + foo -> foo. + foo. -> foo. + foo.. -> foo. + foo\. -> foo\.. + foo\\. -> foo\\. */ +int +__libc_ns_makecanon (const char *src, char *dst, size_t dstsize) +{ + size_t n = strlen (src); + + if (n + sizeof "." > dstsize) /* sizeof == 2. */ + { + __set_errno (EMSGSIZE); + return -1; + } + strcpy (dst, src); + while (n >= 1U && dst[n - 1] == '.') /* Ends in ".". */ + if (n >= 2U && dst[n - 2] == '\\' && /* Ends in "\.". */ + (n < 3U || dst[n - 3] != '\\')) /* But not "\\.". */ + break; + else + dst[--n] = '\0'; + dst[n++] = '.'; + dst[n] = '\0'; + return 0; +} +libc_hidden_def (__libc_ns_makecanon) diff --git a/resolv/ns_samedomain.c b/resolv/ns_samedomain.c index 5d1bf39fc7..cfff2516b0 100644 --- a/resolv/ns_samedomain.c +++ b/resolv/ns_samedomain.c @@ -143,40 +143,6 @@ ns_subdomain(const char *a, const char *b) { return (ns_samename(a, b) != 1 && ns_samedomain(a, b)); } -/*% - * make a canonical copy of domain name "src" - * - * notes: - * \code - * foo -> foo. - * foo. -> foo. - * foo.. -> foo. - * foo\. -> foo\.. - * foo\\. -> foo\\. - * \endcode - */ - -int -ns_makecanon(const char *src, char *dst, size_t dstsize) { - size_t n = strlen(src); - - if (n + sizeof "." > dstsize) { /*%< Note: sizeof == 2 */ - __set_errno (EMSGSIZE); - return (-1); - } - strcpy(dst, src); - while (n >= 1U && dst[n - 1] == '.') /*%< Ends in "." */ - if (n >= 2U && dst[n - 2] == '\\' && /*%< Ends in "\." */ - (n < 3U || dst[n - 3] != '\\')) /*%< But not "\\." */ - break; - else - dst[--n] = '\0'; - dst[n++] = '.'; - dst[n] = '\0'; - return (0); -} -libresolv_hidden_def (ns_makecanon) - /*% * determine whether domain name "a" is the same as domain name "b" * @@ -190,8 +156,8 @@ int ns_samename(const char *a, const char *b) { char ta[NS_MAXDNAME], tb[NS_MAXDNAME]; - if (ns_makecanon(a, ta, sizeof ta) < 0 || - ns_makecanon(b, tb, sizeof tb) < 0) + if (__libc_ns_makecanon(a, ta, sizeof ta) < 0 || + __libc_ns_makecanon(b, tb, sizeof tb) < 0) return (-1); if (strcasecmp(ta, tb) == 0) return (1); diff --git a/resolv/resolv-deprecated.c b/resolv/resolv-deprecated.c new file mode 100644 index 0000000000..cbd1078dc2 --- /dev/null +++ b/resolv/resolv-deprecated.c @@ -0,0 +1,35 @@ +/* Forwarders for deprecated libresolv functions which are implemented in libc. + Copyright (C) 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 + . */ + +/* Some functions are used by the stub resolver implementation + internally and thus have to be located in libc. They have been + historially exported for application use as well. However, the + stub resolver dependency on those functions is not intrinsic to + what the stub resolver does, and it is possible that a future + version of the stub resolver will not need them anymore. The + public symbols for these functions remain in libresolv, and are not + moved to libc, to avoid adding new symbol versions for legacy + functions. */ + +#include + +int +ns_makecanon (const char *src, char *dst, size_t dstsize) +{ + return __libc_ns_makecanon (src, dst, dstsize); +}