From nobody Mon Jun 29 15:52:05 2026 X-Original-To: dev-commits-src-main@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 4gprPd64xsz6jNl3 for ; Mon, 29 Jun 2026 15:52:05 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gprPd4BxFz3Kpn for ; Mon, 29 Jun 2026 15:52:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782748325; 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=fp+9ImxaSURBnX9n3pQuUF6XGdwLoqKcRAq/iAICCUk=; b=qQtVRRigLUsHhdNiWKp2z5NjV3d5epN9UE9Njop9DyNuJI2Rz6hqSQ6Su+6m2KeHzXAvJS Y2S1wDYbcJ9ced5q/EAIxoZnZ6ZeT+3VhuPsIyDQyx91UkRe06fl9E6KaTS8/xyGDI0Me3 fw41Ks1j7ES2sYHHjmR2wBVtOoM2/XlNm1NZlGTS2fvZdvTL7yN07/sejOQvmXTZ4wGzV6 63nrgHwB8Xj7/pwSH1Ujn5iJ2N0fK+rZrqKMK6MjSfqyYUkZFwQdZKhly8ugAE+6S5DUtV tyeU11NJIaWhfTTVJNEJc5ztqfuNBOt30HdiXPWdBLbd26VxiUON5y9sqd2o5g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782748325; a=rsa-sha256; cv=none; b=gdRuu9keatBYmuLo4roW4jBbTccFAaVnjXmDoWbv43YSyKedYBFyJNiGZ4yyH1F7B2t+1R auBNGeneMi117wojIWBYL4ibRjRDw++mddqEXlmJfkDAwE5w/OmtjPZoSSM/fiEmvKnU3f SAVisLndA5fphisrfoRAh/qxgYTG4eYa+oSQHH3q1sBZCOJhaHPD+88mk0cKlD/IJL4g2g Ui8KTw2q8cvLAncYq14snwwrfn/hrszF6HiNxQXjFue4Lhi24X8OrkXdzKhXb+dDcz4D2V eLIPIQbB86KAGYtzOT14VRxhPymGrMKhMDuE0a40TohITAW8rwRWYyd7DITcHg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782748325; 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=fp+9ImxaSURBnX9n3pQuUF6XGdwLoqKcRAq/iAICCUk=; b=iwfe79iZltS4IZ+dtYHhDlrfOqbyqVk2NtP5nscmuuGfNp2LT/t/H8zpDjLcUxS1GsM2Pf toaVFGZHrhtE8+/xOq8+kTy+O+8nktGZBwCJc9uSndLjbytz8kecLqhxhXTDZVnLNQV8VM RnV+he/Wc+hfSCgIpRK63F24w3FXDRVpcSl6Mfa2ONNS6Nzdpapx0vsAF1b7ZzXBu+OfIu jiDYguimJiTPJkSfPU4W4/GOnmPdgaJ1lKEYD0g9patSHH6NADF9GjK5wwAD0cwJ1WC6Xx iZoFETGrfdbZxV/CtKhZKGByb+b3W8QANdyuZugn2IJYIPY4RrJ9MHmyTuyTig== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gprPd38Q9z13J9 for ; Mon, 29 Jun 2026 15:52:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3b69f by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 29 Jun 2026 15:52:05 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: b27e21f304f2 - main - libc/resolv: Drop Solaris 2 compatibility List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b27e21f304f260d539288756c5bb85421a549d44 Auto-Submitted: auto-generated Date: Mon, 29 Jun 2026 15:52:05 +0000 Message-Id: <6a4294a5.3b69f.5f738f0a@gitrepo.freebsd.org> The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=b27e21f304f260d539288756c5bb85421a549d44 commit b27e21f304f260d539288756c5bb85421a549d44 Author: Dag-Erling Smørgrav AuthorDate: 2026-06-25 10:57:11 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-06-29 13:49:18 +0000 libc/resolv: Drop Solaris 2 compatibility MFC after: 1 week --- lib/libc/nameser/ns_parse.c | 5 ----- lib/libc/resolv/res_comp.c | 11 ----------- lib/libc/resolv/res_init.c | 42 ------------------------------------------ 3 files changed, 58 deletions(-) diff --git a/lib/libc/nameser/ns_parse.c b/lib/libc/nameser/ns_parse.c index 40f19d33c2bc..fa21127a5c7e 100644 --- a/lib/libc/nameser/ns_parse.c +++ b/lib/libc/nameser/ns_parse.c @@ -38,12 +38,7 @@ static void setsection(ns_msg *msg, ns_sect sect); /* Macros. */ -#if !defined(SOLARIS2) || defined(__COVERITY__) #define RETERR(err) do { errno = (err); return (-1); } while (0) -#else -#define RETERR(err) \ - do { errno = (err); if (errno == errno) return (-1); } while (0) -#endif #define PARSE_FMT_PRESO 0 /* Parse using presentation-format names */ #define PARSE_FMT_WIRE 1 /* Parse using network-format names */ diff --git a/lib/libc/resolv/res_comp.c b/lib/libc/resolv/res_comp.c index 55b71266b4ae..d9edcc9a4930 100644 --- a/lib/libc/resolv/res_comp.c +++ b/lib/libc/resolv/res_comp.c @@ -240,17 +240,6 @@ res_dnok(const char *dn) { * Note that one _ comes from C and the others come from us. */ -#ifdef SOLARIS2 -#ifdef __putlong -#undef __putlong -#endif -#ifdef __putshort -#undef __putshort -#endif -#pragma weak putlong = __putlong -#pragma weak putshort = __putshort -#endif /* SOLARIS2 */ - void __putlong(u_int32_t src, u_char *dst) { ns_put32(src, dst); } void __putshort(u_int16_t src, u_char *dst) { ns_put16(src, dst); } #ifndef __ultrix__ diff --git a/lib/libc/resolv/res_init.c b/lib/libc/resolv/res_init.c index b21a3fa1670f..e9e982fe27bb 100644 --- a/lib/libc/resolv/res_init.c +++ b/lib/libc/resolv/res_init.c @@ -95,10 +95,6 @@ #include "res_private.h" -#ifdef SOLARIS2 -#include -#endif - static void res_setoptions(res_state, const char *, const char *); #ifdef RESOLVSORT @@ -219,28 +215,6 @@ __res_vinit(res_state statp, int preinit) { #endif res_setservers(statp, u, nitems(u)); -#ifdef SOLARIS2 - /* - * The old libresolv derived the defaultdomain from NIS/NIS+. - * We want to keep this behaviour - */ - { - char buf[sizeof(statp->defdname)], *cp; - int ret; - - if ((ret = sysinfo(SI_SRPC_DOMAIN, buf, sizeof(buf))) > 0 && - (unsigned int)ret <= sizeof(buf)) { - if (buf[0] == '+') - buf[0] = '.'; - cp = strchr(buf, '.'); - cp = (cp == NULL) ? buf : (cp + 1); - strncpy(statp->defdname, cp, - sizeof(statp->defdname) - 1); - statp->defdname[sizeof(statp->defdname) - 1] = '\0'; - } - } -#endif /* SOLARIS2 */ - /* Allow user to override the local domain definition */ if ((cp = secure_getenv("LOCALDOMAIN")) != NULL) { (void)strncpy(statp->defdname, cp, sizeof(statp->defdname) - 1); @@ -580,22 +554,6 @@ res_setoptions(res_state statp, const char *options, const char *source) if (statp->options & RES_DEBUG) printf(";;\ttimeout=%d\n", statp->retrans); #endif -#ifdef SOLARIS2 - } else if (!strncmp(cp, "retrans:", sizeof("retrans:") - 1)) { - /* - * For backward compatibility, 'retrans' is - * supported as an alias for 'timeout', though - * without an imposed maximum. - */ - statp->retrans = atoi(cp + sizeof("retrans:") - 1); - } else if (!strncmp(cp, "retry:", sizeof("retry:") - 1)){ - /* - * For backward compatibility, 'retry' is - * supported as an alias for 'attempts', though - * without an imposed maximum. - */ - statp->retry = atoi(cp + sizeof("retry:") - 1); -#endif /* SOLARIS2 */ } else if (!strncmp(cp, "attempts:", sizeof("attempts:") - 1)){ i = atoi(cp + sizeof("attempts:") - 1); if (i <= RES_MAXRETRY)