From nobody Thu Oct 23 13:32:37 2025 X-Original-To: dev-commits-src-branches@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 4csn5d5SNRz6DVRJ; Thu, 23 Oct 2025 13:32:37 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4csn5d4zbFz3HD9; Thu, 23 Oct 2025 13:32:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761226357; 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=hPXbZlNmZpQNcplcctVq0sPiY+F5gi8/HJb8nMIkBp8=; b=AbfZysumEe+edEUyzBB4OREMf/n65eiTdf3vtufbPeetvsNXEkhymCn33VSAwdsWv1T15D AKuGjxbJqY2rwrWndsICsVLB+OBfinVygv083sS9DVko4+nKT3W/TFrTFv0c3o2Q8ouLvA KAisD7oHX802ZglG/uXOV57r1H5eAsw7Gc8TzYJpuyl9D4Q6deFd3y9RJH0KSlMQqaB8bc bClQh+54mObo/usPRFdJlXQBy1ZQewtY1yvXSuIRJXywtiIUnDpbLJ8aSLm4wBwA3tkFaV B1iI0ooob1P0lX+813gtoNz6BNuSGsz9SQv2gRz+u/e6OEENzqNtYZgG6M86ew== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761226357; 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=hPXbZlNmZpQNcplcctVq0sPiY+F5gi8/HJb8nMIkBp8=; b=iFzNOQvUQPtYENrbsUwsGwefmK0tgNlAe1DFM9gpBhLNlRmWFvgySiyT9eoPNHyjKVS7Ng Lil2Dvma9xu50uW8Gvi/DxO9C0sxLMvkQuI/cUKx9eJsecT9xuCuT2MvrawIw2vOY6379c XrEmBgnBrNKBr0W6Fk+HxZI2QtMSaheLpMokT11n6dxmNrAA1u0oA1IyufKRbR97SAbJyi jBd+tox5FfSD1al3H9R4rI9qjKbiOj+eShvrV3TJogykpdFXoWRxnGl2qTZZG1wK1p2Oc6 ZbfgQjjFB7FFRFED9H8CtpCinO4DzxfWQIqyTOU+rHoZKHgTdN8l06V+yA9AcA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761226357; a=rsa-sha256; cv=none; b=qGGU+4TvGXWMwFyp8Lr87qEx4liW9ZoP0Qp1N9VKEcMJhiwqJQTjaVD19Jf1sP1ecHueK4 Nmdh3LlAigUdPwE9yE8gZBcmo8tGUnOhsTAcGJ3bMxc86a2Awjbdwzccef3TT7ZOdI/3OH UFrNT/rJj6577DSTr0wY6kqojJ2lnh0SFsM81RN1zpzD4CShc/THOgRz2EWtBpnIgwXwUM l/N/oR385GGsq9SIKQbtYdw7eJPKIbMEk4W6/K0mdZUljbT/cjZF4+TCmplK1p4VvF8vie y2mavLQ8YI1kbCPbEN5ilFFUr9ar7U27AIpEpgmS8d7wjo1RnmRbv4Opix06Xg== 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 4csn5d4TN3z1fC; Thu, 23 Oct 2025 13:32:37 +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 59NDWbIV092067; Thu, 23 Oct 2025 13:32:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59NDWb2U092064; Thu, 23 Oct 2025 13:32:37 GMT (envelope-from git) Date: Thu, 23 Oct 2025 13:32:37 GMT Message-Id: <202510231332.59NDWb2U092064@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: f56da8ff57f8 - stable/14 - dma: Don't install dma.conf world-readable List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org 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/stable/14 X-Git-Reftype: branch X-Git-Commit: f56da8ff57f8423f4798d6af48a735037f5d3021 Auto-Submitted: auto-generated The branch stable/14 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=f56da8ff57f8423f4798d6af48a735037f5d3021 commit f56da8ff57f8423f4798d6af48a735037f5d3021 Author: Dag-Erling Smørgrav AuthorDate: 2025-07-26 09:59:53 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2025-10-23 13:32:27 +0000 dma: Don't install dma.conf world-readable While here, install auth.conf into /etc as well. MFC after: 3 days PR: 288409 Reviewed by: ivy, bapt Differential Revision: https://reviews.freebsd.org/D51529 (cherry picked from commit a3d4ae7cf351cc283a670d8400a89518a6b31d63) --- ObsoleteFiles.inc | 3 +++ libexec/dma/dmagent/Makefile | 6 ++++-- tools/build/mk/OptionalObsoleteFiles.inc | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc index 9d8c8a048041..de25b6608fe6 100644 --- a/ObsoleteFiles.inc +++ b/ObsoleteFiles.inc @@ -51,6 +51,9 @@ # xargs -n1 | sort | uniq -d; # done +# 20251023: This file is now installed in /etc/dma +OLD_FILES+=usr/share/examples/dma/auth.conf + # 20251006: Remove libnss_tacplus.a (it never should have been installed) OLD_FILES+=usr/lib/libnss_tacplus.a diff --git a/libexec/dma/dmagent/Makefile b/libexec/dma/dmagent/Makefile index 0b38c5dca6b5..f73ca1ddccf1 100644 --- a/libexec/dma/dmagent/Makefile +++ b/libexec/dma/dmagent/Makefile @@ -18,12 +18,14 @@ SRCS= aliases_parse.y \ util.c MAN8= dma.8 MLINKS= dma.8 dma.conf.5 -CONFS= dma.conf +CONFSMODE= 0640 +CONFSGRP= mail +CONFS= auth.conf dma.conf CONFSDIR= ${CONFDIR}/dma CFLAGS+= -DOPENSSL_API_COMPAT=0x10100000L YFLAGS+= -i CLEANFILES= aliases_parse.i -FILES= auth.conf mailer.conf +FILES= mailer.conf FILESDIR= ${SHAREDIR}/examples/dma BINMODE= 2555 diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc index 331c88c0619b..5b49c713182a 100644 --- a/tools/build/mk/OptionalObsoleteFiles.inc +++ b/tools/build/mk/OptionalObsoleteFiles.inc @@ -1481,12 +1481,12 @@ OLD_DIRS+=usr/share/dict .endif .if ${MK_DMAGENT} == no +OLD_FILES+=etc/dma/auth.conf OLD_FILES+=etc/dma/dma.conf OLD_DIRS+=etc/dma OLD_FILES+=usr/libexec/dma OLD_FILES+=usr/libexec/dma-mbox-create OLD_FILES+=usr/share/man/man8/dma.8.gz -OLD_FILES+=usr/share/examples/dma/auth.conf OLD_FILES+=usr/share/examples/dma/mailer.conf OLD_DIRS+=usr/share/examples/dma .endif