From nobody Mon Jun 29 15:54:26 2026 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 4gprSL4yq0z6jPHd for ; Mon, 29 Jun 2026 15:54:26 +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 4gprSL1XcYz3QZ6 for ; Mon, 29 Jun 2026 15:54:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782748466; 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=XvKGTQBJP1PSdbF3nT0h8umnUeZkSolNj5mvtq27CVc=; b=tKMNrRcOxBBC5oP2hgE1qa13qP5P46ZJNC5+yMGhJVOaDg8sNOXWpJz8VnfS5euIIZwTtO k8PYtuGLs9EhG3fzZjVM29oCuJnUrprNVCgD+/N6FioXLD9Nud307twbgV+7zAeuy26p+D oggNEJfygsp3IIdpQIllxJSA6JyYu13TtOztENhBdTo/4invrq7mY9B/cmOD8H7WX69jLa Fu7U8wJzj6g19t3ZTeX8hudLrI1gzW+eGTIthW28IdWqbsuZYpCnW+gJtxytzEQEzMcA6U aMDYgyf+XoR0lCL3LYCzH79R5dliown6QcpTpNhgjkToU0RttsqY+mwcRV/hAQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782748466; a=rsa-sha256; cv=none; b=EonQvxv1NCZycNqmZu8d9vO3QA212sdgybgE5rsa/Cz6T9Rr+cbELcRvOGzG/OSM+UrrCf YPn9qjDKSXkyQh80NStHZGf2+2PMmi5WlXBtyYizxM3HxN6xAMTGaZD2caafvDAAIidWoH OHMEoq5KPfbgpfINpQTLQvdrAJUwRQ9FeumA9+epKTkjtyUeZkA1/OHaTVoOu7veQM279w 4n4AVBkfsDH5YFPbKbPVcprf9lpMXqdOV0IfBMLPi1tx02bIIIp1Wy4hRieWFfSokscDQV Ahr0OdDA+lvNSsqHuJEP2ugeqUV3dw1mhN1/AL59aI6J7c4u7/JK8hYgELh3yA== 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=1782748466; 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=XvKGTQBJP1PSdbF3nT0h8umnUeZkSolNj5mvtq27CVc=; b=O64tn/U9ZDeoKspArla1rscaOaOIDC0VkcNZgN0GJ5ObMCTXkHpoz/dlkZlkc/3Q0ogzLI 8iqubqL6GuG83B8DMyR7hpjQpf9Bzgy+S196Kfk6n37u+cNtHUKbtf7H34ay32GBBCHWPJ siKK1mzOeQ/APqxwFtWWkZgNl0kJc9k2JBChBTICctFEzFsFpz4o1vl8U6xElf9bejzMLi IaDKC5ZUqIygc7NS3EDhCBQ2JCX/5m7f73yMC+rVKSE8o9n7xldI7IpAQbn/4TKDf6APou sYgp0mkhrgJPEjPMNNECHJgpCjO0yV7OmT8ho4SUl9Ve/qlhN7fsOJraUpHzAA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gprSL0Hrjz13gL for ; Mon, 29 Jun 2026 15:54:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3b79c by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 29 Jun 2026 15:54:26 +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: 955963148a99 - main - Revert "libc/resolv: Add no-debug and no-rotate options" 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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: 955963148a99cc2c45756db76811ef61c75fb5a8 Auto-Submitted: auto-generated Date: Mon, 29 Jun 2026 15:54:26 +0000 Message-Id: <6a429532.3b79c.239dedca@gitrepo.freebsd.org> The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=955963148a99cc2c45756db76811ef61c75fb5a8 commit 955963148a99cc2c45756db76811ef61c75fb5a8 Author: Dag-Erling Smørgrav AuthorDate: 2026-06-29 15:53:58 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-06-29 15:53:58 +0000 Revert "libc/resolv: Add no-debug and no-rotate options" This reverts commit 61697e9cd5cccc367a38f9851efebad4d7c2bb65. --- lib/libc/resolv/res_init.c | 4 ---- share/man/man5/resolver.5 | 12 ------------ 2 files changed, 16 deletions(-) diff --git a/lib/libc/resolv/res_init.c b/lib/libc/resolv/res_init.c index c7eda833f3d5..a0cd381d0f0f 100644 --- a/lib/libc/resolv/res_init.c +++ b/lib/libc/resolv/res_init.c @@ -752,10 +752,6 @@ res_setoptions(res_state statp, const char *options, const char *source) #ifdef DEBUG printf(";;\tdebug\n"); #endif - } else if (res_match(cp, ep, "no-debug")) { - statp->options &= ~RES_DEBUG; - } else if (res_match(cp, ep, "no-rotate")) { - statp->options &= ~RES_ROTATE; } else if (res_match(cp, ep, "no-tld-query") || res_match(cp, ep, "no_tld_query")) { statp->options |= RES_NOTLDQUERY; diff --git a/share/man/man5/resolver.5 b/share/man/man5/resolver.5 index 690d8b10d4e2..135e56287b5f 100644 --- a/share/man/man5/resolver.5 +++ b/share/man/man5/resolver.5 @@ -203,18 +203,6 @@ Sets .Dv RES_NOCHECKNAME . Disables the check of incoming host names for invalid characters such as underscore, non-ASCII, or control characters. -.It Cm no-debug -Clears -.Dv RES_DEBUG . -See -.Cm debug -above. -.It Cm no-rotate -Clears -.Dv RES_ROTATE . -See -.Cm rotate -below. .It Cm no-tld-query tells the resolver not to attempt to resolve a top level domain name, that is, a name that contains no dots.