Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 1 May 2025 16:48:56 GMT
From:      Dmitry Morozovsky <marck@FreeBSD.org>
To:        src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org
Subject:   git: 89a66a1cb3ce - main - inetd: Add -S to tftpd usage example in inetd.conf
Message-ID:  <202505011648.541GmuQp015875@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by marck:

URL: https://cgit.FreeBSD.org/src/commit/?id=89a66a1cb3ce159b830d3b5391d85bbabd46a56d

commit 89a66a1cb3ce159b830d3b5391d85bbabd46a56d
Author:     Dmitry Morozovsky <marck@FreeBSD.org>
AuthorDate: 2025-05-01 16:46:00 +0000
Commit:     Dmitry Morozovsky <marck@FreeBSD.org>
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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202505011648.541GmuQp015875>