From nobody Fri Sep 04 14:28:58 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 4hbzNq2qSMz6qm6j for ; Fri, 04 Sep 2026 14:28:59 +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 "YR2" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4hbzNp5x3hz3Tdv for ; Fri, 04 Sep 2026 14:28:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1788532138; 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=aH/8sK9qBlQO7U9UfbwcZpzV9EilGPnGuesnRIaE6Xc=; b=yCnPngZbWS3j7qpU1y47n93qEhRo9QqysXCT80Wz6I20cTX8aqbO2FIwosFzBOfFZiPqek Okey46fJL/vl3teSJLvFTmAxlYP3cNtpVa9dZLbiA7/KfRycscxTdEiPC+Q92U79Oz165s clnvqhqZOd4NFSXDY1svnHJYR0FhV73yPeahxOf1+4e2rz3K8ioKs0lrDxW84e0UEDGj6e MmwBeUGuihuNcJaG8wmnRjaS+LAXxmAm/HBUonuB6ORy9qy1kyGLsBbQk8cDC2V/OgB6eD GCHZnpophMDZ10R6Stgf+iZNiJFykUoRcncY/wz3CSeKmCl6HBTbbQCN+oZTiA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1788532138; a=rsa-sha256; cv=none; b=aHxao45q8Vu1iuPTFGCsKhiUmrpW51xGtmg7kP6rIRiZyOLK+5rcn7kgr9ixE+snbKiJ0L 0jMSXKNAt1ye8nhQQ0MVSzefgFK278FGb2oCg87cs5ONiq8XZQ3Cc9k/Dr4qURR1ZFh+0b tKMzASCvNS+aoMNX+TxA9FuU5D6ZS9rATIMLMHAgp7kTS/rC687Qy0/SS39qWbJ6Tnexn2 EEiq0njupA1zsekSLc26doBYsmHNfRHqIJEzpOzGXsWxrcGULVGT95YW87z0jIlMhmWfEo n/oWhbbyppshNq/p9f2BCJKylTvE2XLVRLS+OqtsoryVPcFa+EDiHWO9pfcdaA== 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=1788532138; 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=aH/8sK9qBlQO7U9UfbwcZpzV9EilGPnGuesnRIaE6Xc=; b=xFAfI2pBn+Du182hQJcfoLX2ref8IOYhJzbUXKCc378I9eTmiGOZ1uQ0jlnbwxg8XIZB3N Cy6r2yXqtx6Remp9Q3V8MuRlFf4HJaeQffGzXg5f0BZ8aZh/nZyjEfpal6f4sZeTJTr/zj y25z026ckUBaFFV481vO4qudHk4Z9kE4QPH1ByYLCYyEIUg0R1rjMLujcZCV4BXB6G9q2c qjxpWrXTdoWL23B+wGwXldTh+Pjc/+QgiXJ9bccoZEPCkfs0afgZDLP2h7ireRza9pvI6e aLjKm6SWzBa475hcgJjnN89i6XYitRT+9GWpf/chdrgGyx+r1Tka+mQNZwBVrw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hbzNp3t9Qz12s0 for ; Fri, 04 Sep 2026 14:28:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 36b3e by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 04 Sep 2026 14:28:58 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Baptiste Daroussin Subject: git: 1ccf8075eaa8 - main - pw: remove mail file with unlinkat instead of building a path 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: bapt X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1ccf8075eaa84088ad4acb65aabb1e59c3fddd3f Auto-Submitted: auto-generated Date: Fri, 04 Sep 2026 14:28:58 +0000 Message-Id: <6a9ad5aa.36b3e.70a2511c@gitrepo.freebsd.org> The branch main has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=1ccf8075eaa84088ad4acb65aabb1e59c3fddd3f commit 1ccf8075eaa84088ad4acb65aabb1e59c3fddd3f Author: Baptiste Daroussin AuthorDate: 2026-09-04 14:00:07 +0000 Commit: Baptiste Daroussin CommitDate: 2026-09-04 14:28:47 +0000 pw: remove mail file with unlinkat instead of building a path This is consistent with how at jobs and crontabs are removed. MFC After: 1 week --- usr.sbin/pw/pw_user.c | 11 +++++++---- usr.sbin/pw/tests/pw_userdel_test.sh | 16 ++++++++++++++++ 2 files changed, 23 insertions(+), 4 deletions(-) diff --git a/usr.sbin/pw/pw_user.c b/usr.sbin/pw/pw_user.c index 26e414831448..e8611b1323af 100644 --- a/usr.sbin/pw/pw_user.c +++ b/usr.sbin/pw/pw_user.c @@ -837,7 +837,6 @@ pw_user_del(int argc, char **argv, char *arg1) char *name = NULL; char grname[MAXLOGNAME]; char *nispasswd = NULL; - char file[MAXPATHLEN]; char home[MAXPATHLEN]; const char *cfg = NULL; struct stat st; @@ -936,7 +935,6 @@ pw_user_del(int argc, char **argv, char *arg1) * Save these for later, since contents of pwd may be * invalidated by deletion */ - snprintf(file, sizeof(file), "%s/%s", _PATH_MAILDIR, pwd->pw_name); strlcpy(home, pwd->pw_dir, sizeof(home)); gr = GETGRGID(pwd->pw_gid); if (gr != NULL) @@ -987,8 +985,13 @@ pw_user_del(int argc, char **argv, char *arg1) (uintmax_t)id); /* Remove mail file */ - if (PWALTDIR() != PWF_ALT) - unlinkat(conf.rootfd, file + 1, 0); + if (PWALTDIR() != PWF_ALT) { + int mfd = openat(conf.rootfd, &_PATH_MAILDIR[1], O_DIRECTORY | O_CLOEXEC); + if (mfd != -1) { + unlinkat(mfd, pwd->pw_name, 0); + close(mfd); + } + } /* Remove at jobs */ if (PWALTDIR() != PWF_ALT && GETPWUID(id) == NULL) diff --git a/usr.sbin/pw/tests/pw_userdel_test.sh b/usr.sbin/pw/tests/pw_userdel_test.sh index 23c85ef185cb..1c77dd83cd89 100755 --- a/usr.sbin/pw/tests/pw_userdel_test.sh +++ b/usr.sbin/pw/tests/pw_userdel_test.sh @@ -127,6 +127,21 @@ delete_crontab_cleanup() { rm -rf ${HOME}/var/cron/tabs } +atf_test_case delete_mail cleanup +delete_mail_body() { + populate_root_etc_skel + + mkdir -p ${HOME}/var/mail + + atf_check -s exit:0 ${RPW} useradd foo + atf_check -s exit:0 ${RPW} userdel foo + + [ ! -e ${HOME}/var/mail/foo ] || atf_fail "mail file not removed" +} +delete_mail_cleanup() { + rm -rf ${HOME}/var/mail +} + atf_init_test_cases() { atf_add_test_case rmuser_seperate_group atf_add_test_case user_do_not_try_to_delete_root_if_user_unknown @@ -137,4 +152,5 @@ atf_init_test_cases() { atf_add_test_case home_regular_dir atf_add_test_case delete_at_jobs atf_add_test_case delete_crontab + atf_add_test_case delete_mail }