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=-4.3 required=3.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI,SPF_HELO_PASS,SPF_PASS shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from sourceware.org (server2.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 8E6A81F8C7 for ; Thu, 8 Jul 2021 15:19:20 +0000 (UTC) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id C49F339DC4F5 for ; Thu, 8 Jul 2021 15:19:19 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org C49F339DC4F5 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1625757559; bh=hjvwaTVntxZUK/S3ocGQP2bNeXgG69mDz6Pz666HB4A=; 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=OMN+bF7RE3JXzBbOqIjBBNqFsha1fboO8Ezptz1guzKxee2iR0weDqXd4sWwjYmej fgBWqjfVdS8ReZ2d8buAGLCNrCNJwld+vyHzfW7t6oZpdLo2G+H/h55zApd9JT7ADP 0ORF20PSuwq7iEezu5yUtNAOlmnJmIcLn8XelMJw= Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by sourceware.org (Postfix) with ESMTP id B97C2399C007 for ; Thu, 8 Jul 2021 15:05:41 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org B97C2399C007 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-308-033FGcohOF29XTlYCrrucA-1; Thu, 08 Jul 2021 11:05:40 -0400 X-MC-Unique: 033FGcohOF29XTlYCrrucA-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id C2F1F100CF6E for ; Thu, 8 Jul 2021 15:05:39 +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 42F0E5D9D3 for ; Thu, 8 Jul 2021 15:05:37 +0000 (UTC) To: libc-alpha@sourceware.org Subject: [PATCH 21/30] resolv: Move ns_samename into its own file, and into libc In-Reply-To: References: X-From-Line: 5d3f0ea1306e8740a78f0f123eb3807027a8b1f2 Mon Sep 17 00:00:00 2001 Message-Id: <5d3f0ea1306e8740a78f0f123eb3807027a8b1f2.1625755446.git.fweimer@redhat.com> Date: Thu, 08 Jul 2021 17:05:34 +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.14 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" But only as an internal symbol, __libc_ns_samename. 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. --- include/arpa/nameser.h | 3 ++- resolv/Makefile | 1 + resolv/Versions | 1 + resolv/ns_print.c | 6 +++--- resolv/ns_samedomain.c | 28 +++------------------------- resolv/ns_samename.c | 38 ++++++++++++++++++++++++++++++++++++++ resolv/res_query.c | 2 +- resolv/res_send.c | 4 ++-- resolv/resolv-deprecated.c | 6 ++++++ 9 files changed, 57 insertions(+), 32 deletions(-) create mode 100644 resolv/ns_samename.c diff --git a/include/arpa/nameser.h b/include/arpa/nameser.h index a529cc86d3..53f1dbc7c3 100644 --- a/include/arpa/nameser.h +++ b/include/arpa/nameser.h @@ -68,7 +68,6 @@ libresolv_hidden_proto (ns_parserr) libresolv_hidden_proto (ns_sprintrr) libresolv_hidden_proto (ns_sprintrrf) libresolv_hidden_proto (ns_samedomain) -libresolv_hidden_proto (ns_samename) libresolv_hidden_proto (ns_format_ttl) extern __typeof (ns_makecanon) __libc_ns_makecanon; @@ -87,6 +86,8 @@ extern __typeof (ns_name_uncompress) __ns_name_uncompress; libc_hidden_proto (__ns_name_uncompress) extern __typeof (ns_name_unpack) __ns_name_unpack; libc_hidden_proto (__ns_name_unpack) +extern __typeof (ns_samename) __libc_ns_samename; +libc_hidden_proto (__libc_ns_samename) # endif /* !_ISOMAC */ #endif diff --git a/resolv/Makefile b/resolv/Makefile index d1ad5e4cba..744da951ae 100644 --- a/resolv/Makefile +++ b/resolv/Makefile @@ -43,6 +43,7 @@ routines := \ ns_name_skip \ ns_name_uncompress \ ns_name_unpack \ + ns_samename \ nsap_addr \ res-close \ res-name-checking \ diff --git a/resolv/Versions b/resolv/Versions index 93078de25c..2201d4224c 100644 --- a/resolv/Versions +++ b/resolv/Versions @@ -73,6 +73,7 @@ libc { __libc_dn_expand; __libc_dn_skipname; __libc_ns_makecanon; + __libc_ns_samename; __libc_res_dnok; __libc_res_hnok; __ns_name_compress; diff --git a/resolv/ns_print.c b/resolv/ns_print.c index 9a9602d74c..43f39edf61 100644 --- a/resolv/ns_print.c +++ b/resolv/ns_print.c @@ -103,9 +103,9 @@ ns_sprintrrf(const u_char *msg, size_t msglen, /* * Owner. */ - if (name_ctx != NULL && ns_samename(name_ctx, name) == 1) { + if (name_ctx != NULL && __libc_ns_samename (name_ctx, name) == 1) T(addstr("\t\t\t", 3, &buf, &buflen)); - } else { + else { len = prune_origin(name, origin); if (*name == '\0') { goto root; @@ -621,7 +621,7 @@ prune_origin(const char *name, const char *origin) { const char *oname = name; while (*name != '\0') { - if (origin != NULL && ns_samename(name, origin) == 1) + if (origin != NULL && __libc_ns_samename (name, origin) == 1) return (name - oname - (name > oname)); while (*name != '\0') { if (*name == '\\') { diff --git a/resolv/ns_samedomain.c b/resolv/ns_samedomain.c index cfff2516b0..46cb8f5fb2 100644 --- a/resolv/ns_samedomain.c +++ b/resolv/ns_samedomain.c @@ -139,31 +139,9 @@ libresolv_hidden_def (ns_samedomain) * is "a" a subdomain of "b"? */ int -ns_subdomain(const char *a, const char *b) { - return (ns_samename(a, b) != 1 && ns_samedomain(a, b)); +ns_subdomain (const char *a, const char *b) +{ + return __libc_ns_samename (a, b) != 1 && ns_samedomain (a, b); } -/*% - * determine whether domain name "a" is the same as domain name "b" - * - * return: - *\li -1 on error - *\li 0 if names differ - *\li 1 if names are the same - */ - -int -ns_samename(const char *a, const char *b) { - char ta[NS_MAXDNAME], tb[NS_MAXDNAME]; - - 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); - else - return (0); -} -libresolv_hidden_def (ns_samename) - /*! \file */ diff --git a/resolv/ns_samename.c b/resolv/ns_samename.c new file mode 100644 index 0000000000..61fe3cab43 --- /dev/null +++ b/resolv/ns_samename.c @@ -0,0 +1,38 @@ +/* Check if two domain names are equal after trailing dot normalization. + * 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 + +/* Determines whether domain name A is the same as domain name B. + Returns -1 on error, 0 if names differ, 1 if names are the + same. */ +int +__libc_ns_samename (const char *a, const char *b) +{ + char ta[NS_MAXDNAME], tb[NS_MAXDNAME]; + + 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; + else + return 0; +} +libc_hidden_def (__libc_ns_samename) diff --git a/resolv/res_query.c b/resolv/res_query.c index ebbe5a6a4e..5b51af8451 100644 --- a/resolv/res_query.c +++ b/resolv/res_query.c @@ -656,7 +656,7 @@ __res_context_hostalias (struct resolv_context *ctx, if (!*cp1) break; *cp1 = '\0'; - if (ns_samename(buf, name) == 1) { + if (__libc_ns_samename(buf, name) == 1) { while (isspace(*++cp1)) ; if (!*cp1) diff --git a/resolv/res_send.c b/resolv/res_send.c index 915fc6d2c6..dfea9fc7fa 100644 --- a/resolv/res_send.c +++ b/resolv/res_send.c @@ -224,8 +224,8 @@ res_nameinquery(const char *name, int type, int class, return (-1); NS_GET16(ttype, cp); NS_GET16(tclass, cp); - if (ttype == type && tclass == class && - ns_samename(tname, name) == 1) + if (ttype == type && tclass == class + && __libc_ns_samename (tname, name) == 1) return (1); } return (0); diff --git a/resolv/resolv-deprecated.c b/resolv/resolv-deprecated.c index cbd1078dc2..d8344f8f39 100644 --- a/resolv/resolv-deprecated.c +++ b/resolv/resolv-deprecated.c @@ -33,3 +33,9 @@ ns_makecanon (const char *src, char *dst, size_t dstsize) { return __libc_ns_makecanon (src, dst, dstsize); } + +int +ns_samename (const char *a, const char *b) +{ + return __libc_ns_samename (a, b); +} -- 2.31.1