From nobody Wed Mar 22 19:00:43 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Phd8q63vFz419jl; Wed, 22 Mar 2023 19:00:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (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 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Phd8q5g46z44d5; Wed, 22 Mar 2023 19:00:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679511643; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8lmKdqywq3cbQxBJNndz+waTnVU7TUUcRS2QLLd62l0=; b=I6wq8sdeXhbj3+pPnsnv3pPbFTAMS3mb3HiBxD2hQVeRvFdQDJeXPVEZJ5r4qdeKAVGvkl pyKofc2iCLhVT4GvfteS3wluGjEiVsMzzB6C1g/q5UFoWHluiC79rSr+AuVCImEVTa3wZH DwZGFDa0Hrnq8MBY7rtEohTuwIhVKDce7jyBWivZHRM7ABlHKdbZUIQE0OnSTQvQxpFQEI uIdCoG2mQIjwu6C1TOh8EUnqr/j6RTFjj+4xGuaaXtijq3mABX4xQzYSCfhw7hBsYShIon Jt6MtGXraf3WogLuRmMpCD6VyhXzwzJG60xr5cl6Hi8kwTK5FZZ7/KICTzjkkA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679511643; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8lmKdqywq3cbQxBJNndz+waTnVU7TUUcRS2QLLd62l0=; b=DqEu/+vEMP3xYHr3c+33gom+iPh5cXambX//MXM43hP1Lq/EEXrc608aBeUPOmzhGcPmp7 zoSuuvkBNiVLN0yC58rc+IaiHTmFLi55mRpMOJizr4GL5fB8HCFHlFrlNu+29xQoUfbeL0 djCDAF2p1tE1xSBrVgWiQ3NG+srANOkuTf4ufMbm09gLNohozvPGrsQNOFO+GmXbDP/3VA YkxpSoZkXGa2RSHPSyId7u/Ut+PDg3ceX/Dp3esHF4hMVOZqQfuoCfrzkILMsJJzhMVz9M oBCymj74y2lTbywiS4vZ3/IxGBGvKMU7Vif7mJzxnn4nfMLgnRRQPtx4MgkKgg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679511643; a=rsa-sha256; cv=none; b=VoySfGwednXfn7JKMFwHxnFKaQc9QAgQYOTP5RPAwuqwisM6r5zJc1Tv3cV94PCzMI7Is6 Y+fZQXuLLvECUrve2yid/c/KMoXehJ0AhcV8u+41au3wRgW+uBiQorHgiwBbWIGA02bupo lUc3Bf9l6mWMGTLEVmY+0hnntzNna/lrdIUCGy68r4wdPygByiP+UgiGkOCfrHzoVH6Y0R 56VYxkgZfBjbKIqaU6zbjGbrL5ilwkCOIpD1PO/h9dyq7+gwycGjzdVBFUr8gfgjJ1rA6o z+K8x43x4LgqxOfDEbKGwrC7zPA22I07HnztS0pnt7rq5/5QqecUrPd2227sWw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Phd8q4mvKz14pd; Wed, 22 Mar 2023 19:00:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32MJ0hOf063901; Wed, 22 Mar 2023 19:00:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32MJ0hXW063900; Wed, 22 Mar 2023 19:00:43 GMT (envelope-from git) Date: Wed, 22 Mar 2023 19:00:43 GMT Message-Id: <202303221900.32MJ0hXW063900@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: f9c7fb7caed0 - main - arpa: garbage collect ns_newmsg/ns_rdata decls List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f9c7fb7caed063757c7bb6a08cb5e81b2bbb5a6e Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=f9c7fb7caed063757c7bb6a08cb5e81b2bbb5a6e commit f9c7fb7caed063757c7bb6a08cb5e81b2bbb5a6e Author: Val Packett AuthorDate: 2023-02-06 19:03:58 +0000 Commit: Ed Maste CommitDate: 2023-03-22 18:58:23 +0000 arpa: garbage collect ns_newmsg/ns_rdata decls These were brought in by the libbind import, but these functions were never actually implemented anywhere, only header declarations and symbol map entries were imported. Fixes: 046c3635cdb2 ("Bring final version of libbind:") Fixes: e45764721aed ("Update our stub resolver to final version of ...") Reported by: ld.lld 16 being --no-undefined-version by default Sponsored by: https://www.patreon.com/valpackett Reviewed by: emaste Pull request: https://github.com/freebsd/freebsd-src/pull/700 Differential Revision: https://reviews.freebsd.org/D38407 --- include/arpa/nameser.h | 40 ---------------------------------------- lib/libc/nameser/Symbol.map | 10 ---------- 2 files changed, 50 deletions(-) diff --git a/include/arpa/nameser.h b/include/arpa/nameser.h index 5dcc4f3b911c..69ec06dd7233 100644 --- a/include/arpa/nameser.h +++ b/include/arpa/nameser.h @@ -133,17 +133,6 @@ typedef struct __ns_msg { const u_char *_msg_ptr; } ns_msg; -/* - * This is a newmsg handle, used when constructing new messages with - * ns_newmsg_init, et al. - */ -struct ns_newmsg { - ns_msg msg; - const u_char *dnptrs[25]; - const u_char **lastdnptr; -}; -typedef struct ns_newmsg ns_newmsg; - /* Private data structure - do not use from outside library. */ struct _ns_flagdata { int mask, shift; }; extern struct _ns_flagdata _ns_flagdata[]; @@ -571,16 +560,6 @@ typedef enum __ns_cert_types { #endif #define ns_makecanon __ns_makecanon #define ns_samename __ns_samename -#define ns_newmsg_init __ns_newmsg_init -#define ns_newmsg_copy __ns_newmsg_copy -#define ns_newmsg_id __ns_newmsg_id -#define ns_newmsg_flag __ns_newmsg_flag -#define ns_newmsg_q __ns_newmsg_q -#define ns_newmsg_rr __ns_newmsg_rr -#define ns_newmsg_done __ns_newmsg_done -#define ns_rdata_unpack __ns_rdata_unpack -#define ns_rdata_equal __ns_rdata_equal -#define ns_rdata_refers __ns_rdata_refers __BEGIN_DECLS int ns_msg_getflag(ns_msg, int); @@ -653,25 +632,6 @@ int ns_subdomain(const char *, const char *); #endif int ns_makecanon(const char *, char *, size_t); int ns_samename(const char *, const char *); -int ns_newmsg_init(u_char *buffer, size_t bufsiz, ns_newmsg *); -int ns_newmsg_copy(ns_newmsg *, ns_msg *); -void ns_newmsg_id(ns_newmsg *handle, u_int16_t id); -void ns_newmsg_flag(ns_newmsg *handle, ns_flag flag, u_int value); -int ns_newmsg_q(ns_newmsg *handle, ns_nname_ct qname, - ns_type qtype, ns_class qclass); -int ns_newmsg_rr(ns_newmsg *handle, ns_sect sect, - ns_nname_ct name, ns_type type, - ns_class rr_class, u_int32_t ttl, - u_int16_t rdlen, const u_char *rdata); -size_t ns_newmsg_done(ns_newmsg *handle); -ssize_t ns_rdata_unpack(const u_char *, const u_char *, ns_type, - const u_char *, size_t, u_char *, size_t); -int ns_rdata_equal(ns_type, - const u_char *, size_t, - const u_char *, size_t); -int ns_rdata_refers(ns_type, - const u_char *, size_t, - const u_char *); __END_DECLS #ifdef BIND_4_COMPAT diff --git a/lib/libc/nameser/Symbol.map b/lib/libc/nameser/Symbol.map index 2c4b76e69410..b91977b9a07b 100644 --- a/lib/libc/nameser/Symbol.map +++ b/lib/libc/nameser/Symbol.map @@ -39,14 +39,4 @@ FBSD_1.4 { __ns_name_owned; __ns_name_map; __ns_name_labels; - __ns_newmsg_init; - __ns_newmsg_copy; - __ns_newmsg_id; - __ns_newmsg_flag; - __ns_newmsg_q; - __ns_newmsg_rr; - __ns_newmsg_done; - __ns_rdata_unpack; - __ns_rdata_equal; - __ns_rdata_refers; };