From nobody Thu May 1 16:48:56 2025 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 4ZpKkw3xHFz5vQWS; Thu, 01 May 2025 16:48:56 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZpKkw3X0Hz3G94; Thu, 01 May 2025 16:48:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746118136; 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=6HQPc7nJpV/lzNnS3GT/MUu4Na486CnB9hHiWDsciwA=; b=v5ietGG0zUI3aglSfaUXpvGVXxBCvpPtZva45BNeJKm8CYiESpWRV8/exJczhkXUcZywcC lo6KteftiWIrw5PXAvv1x/6un4tHGhTwBINT5ncFWw1mgb8zuR+H3WEdUPLpXLAa5WjMAz Y6s7aJFx864W8QQnCqirEl7B2yi3tcgwLgovPkB2jd1kLVmIvq/aVm4+Zrz9PxNzuoNsIi AkOShSqyHagaOelFtUOsUPS0SsGnUoJIeDlqXEpGMV9r6x4ts4AtoXFW8aHaga73dKGc0e xBOBunHbXANFqJJHbJScn3adYE84fDbTg5LxHT6njM9zsv6Xvy+EC4hjs7smEg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746118136; 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=6HQPc7nJpV/lzNnS3GT/MUu4Na486CnB9hHiWDsciwA=; b=MbCOrj6Exjj2eZfKqxtfkx5d1PrlhxSS1/AdLns9055Ol0vchjy93nATdITSbCz5QCA05J 8pprfX11VY4EaNuEgkV+6BQlrgCTzAGtanFmxnkDafmwhRDyK6qIWwQf07EmH8jNaFPtLS y+N/RYYRi555flNub9KykJAqGsOCb/cESQlQat3bsiP8v4eEN4nnXGwIKdqh1yE2zcaLdM vyZ8kZkYfOx7dnoT+rDu6I+J/YeYE4+hWnl5q6nwj+Wxa83LPqm7/633pw1q6V0OuHbq1R 3AEm8+emclkwL+jgx5KNA9OETpun5ekG6aVMQKxp8SNPFzUK0I5Se2n6+ZRC5w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1746118136; a=rsa-sha256; cv=none; b=ogcdni2XJE8iHmqrumb3UKF/9XQi7KCYzn716zjiYxbilBlTORJd/e40ZGCF8XQChpwCjf xsFPrTiJI61eDoXGFOWkPQT/x11V6mpxRk6WRHRZdqPMjasWvhWGgwI0zVXHkWcirbq5j/ LMniXcfvI7x0baazzP1pqgylKwn1/KFHgy56hEK0jal5SBfgDktM3+qPwU4CIJkxbwfqab fKL9mwqQJd/ERxnBy4UMB7dM7Jp3kHdle8Q8B0Ejt3jWUCBT4E14CQkMCTQLuZwfMMZCij PkpPGNEda6E6EnXqT12j4ux7US3QTjkl5+Zy2Z11TGjrv0p027fCb9L/tsWebg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4ZpKkw2dlMzc7w; Thu, 01 May 2025 16:48:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 541GmuMo015878; Thu, 1 May 2025 16:48:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 541GmuQp015875; Thu, 1 May 2025 16:48:56 GMT (envelope-from git) Date: Thu, 1 May 2025 16:48:56 GMT Message-Id: <202505011648.541GmuQp015875@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dmitry Morozovsky Subject: git: 89a66a1cb3ce - main - inetd: Add -S to tftpd usage example in inetd.conf 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 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: marck X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 89a66a1cb3ce159b830d3b5391d85bbabd46a56d Auto-Submitted: auto-generated The branch main has been updated by marck: URL: https://cgit.FreeBSD.org/src/commit/?id=89a66a1cb3ce159b830d3b5391d85bbabd46a56d commit 89a66a1cb3ce159b830d3b5391d85bbabd46a56d Author: Dmitry Morozovsky AuthorDate: 2025-05-01 16:46:00 +0000 Commit: Dmitry Morozovsky CommitDate: 2025-05-01 16:46:00 +0000 inetd: Add -S to tftpd usage example in inetd.conf Since 273a307d0b80743fb08e23237b3f74dc94a8fa2a there is '-S' option which uses generic file permissions when tftpd is chrooted ('-s /chroot/dir') instead of special requirements "be publicly writable" The '-s /tftproot' is always used in the usage example, so add '-S' here too Reviewed by: eugen Differential Revision: https://reviews.freebsd.org/D49807 --- usr.sbin/inetd/inetd.conf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/usr.sbin/inetd/inetd.conf b/usr.sbin/inetd/inetd.conf index 14e5fec5d1bf..40f1e1285af6 100644 --- a/usr.sbin/inetd/inetd.conf +++ b/usr.sbin/inetd/inetd.conf @@ -24,8 +24,8 @@ # # ntalk is required for the 'talk' utility to work correctly #ntalk dgram udp wait tty:tty /usr/libexec/ntalkd ntalkd -#tftp dgram udp wait root /usr/libexec/tftpd tftpd -l -s /tftpboot -#tftp dgram udp6 wait root /usr/libexec/tftpd tftpd -l -s /tftpboot +#tftp dgram udp wait root /usr/libexec/tftpd tftpd -l -S -s /tftpboot +#tftp dgram udp6 wait root /usr/libexec/tftpd tftpd -l -S -s /tftpboot #bootps dgram udp wait root /usr/libexec/bootpd bootpd # # "Small servers" -- used to be standard on, but we're more conservative