From nobody Fri Sep 04 14:28:57 2026 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 4hbzNn6dsvz6qljx for ; Fri, 04 Sep 2026 14:28:57 +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 4hbzNn4llvz3TSg for ; Fri, 04 Sep 2026 14:28:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1788532137; 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=DvR7do3+5nVCEWKSVW1q8D796EoVSxjXiLWSuxgEaJI=; b=a2kBjDM+Qd0xJP+7GSz8q3kZLZyO4YYvzIy33haH6K+zgQv9SEoWuugWY8pY8yDWAy7EWg RdXAEh72a1bOSWlZVEwMx3QJcRGtIXQiKw2ycNR8Bqjn4dcUe88ij7n4VqsE5jbSbD+Fz/ bZ/h3g3OTcao036C+ewgC3+dLsTljz3rLMYXXxjFbdGQF7ThoVCmcX6K4pv/M4hLbtTAYU FJKWkM9U10ohLaA9XN439xrHKLROsP9IIJi+IjZ9Coo2C233+Zk9k089bupyfXytByScdD JXe8q7rACgVoVf6ST693EmvV2bnxfkKGuQRhANfphw6VkaTyzD7RM6Ro216ITw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1788532137; a=rsa-sha256; cv=none; b=Uvr5qqgHHkfsLMst3s8zgd8IoPvwiMnVBJCIEm+pkxBIjs7bvdbBSoQliKMYhjYaqOO96z JXjnbWzGuDYZ5j0X7Ic+fn0hrWP3p0cpI9EInfpCbXV9Ryjt73DhvsK1d1AfndbhwnIpBC 8pBrEEpEP8eoQne8Xprvx3JKyuBPuZhFQBmQjY+K7TqiVAjOU/sr8AvKnzAjozYIwc2bT8 bbVnpzM48qpwqXBdcsLehCc6MWfdaDwnG6g4l6V92iOCbJH6WDplLCYUa0wHtL8fK/9NQa hSqn1whTlr3a+IUTKYuoaQeL1QpDnZC/rltNqcpp0cYJgV6koVkvmIQIpRNa+A== 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=1788532137; 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=DvR7do3+5nVCEWKSVW1q8D796EoVSxjXiLWSuxgEaJI=; b=nOQrCeOZaI/LyrQyVRhzHtobqTSIiUJ/p8DGbOjLtw2nhTJEb6MDkJnuurncQLbPpQhE8F 6/zGAAdiYGSl6F1lKFnjJzrvuChtBEWJJjfkTo/gXjPGCVw2b9cND6upGwYAWy8TSVjxRQ SlxqoIrZLkSUSO7OxBNaKMigSfXZi1Yb+3Mj2W+fJTLBpxGgtZrH8mg3icKOtNspgKkm1L zYkZymsRPE4Fpcw4+8XbJqIt9m/hnEdCAlxdlvNikJ8ZwXODcUqX07GkvKxUom3mFXnF2m DLa739rXuv5bUMUeW7YUtOWzCEQVCN7miLMLKnfmFsg3ofhX5oJRqvlZ/u5EBw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hbzNn3RDYz12ry for ; Fri, 04 Sep 2026 14:28:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 36913 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 04 Sep 2026 14:28:57 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Baptiste Daroussin Subject: git: ba391775e8ac - main - pw: remove crontab with unlinkat instead of spawning crontab 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 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: ba391775e8acb7a539c18f1231a396a7d0d763e9 Auto-Submitted: auto-generated Date: Fri, 04 Sep 2026 14:28:57 +0000 Message-Id: <6a9ad5a9.36913.3d548b76@gitrepo.freebsd.org> The branch main has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=ba391775e8acb7a539c18f1231a396a7d0d763e9 commit ba391775e8acb7a539c18f1231a396a7d0d763e9 Author: Baptiste Daroussin AuthorDate: 2026-09-04 12:56:37 +0000 Commit: Baptiste Daroussin CommitDate: 2026-09-04 14:28:47 +0000 pw: remove crontab with unlinkat instead of spawning crontab crontab -r only unlinks the crontab file, so spawn it directly with unlinkat() relative to conf.rootfd. This also makes the crontab removal work with pw -R. MFC After: 1 week --- usr.sbin/pw/pw_user.c | 26 +++++--------------------- usr.sbin/pw/tests/pw_userdel_test.sh | 18 ++++++++++++++++++ 2 files changed, 23 insertions(+), 21 deletions(-) diff --git a/usr.sbin/pw/pw_user.c b/usr.sbin/pw/pw_user.c index 9c48ef3fcb5e..26e414831448 100644 --- a/usr.sbin/pw/pw_user.c +++ b/usr.sbin/pw/pw_user.c @@ -28,7 +28,6 @@ */ #include -#include #include #include @@ -45,7 +44,6 @@ #include #include #include -#include #include "pw.h" #include "bitmap.h" @@ -53,7 +51,6 @@ #define LOGNAMESIZE (MAXLOGNAME-1) -extern char **environ; static char locked_str[] = "*LOCKED*"; static struct passwd fakeuser = { @@ -926,25 +923,12 @@ pw_user_del(int argc, char **argv, char *arg1) if (strcmp(pwd->pw_name, "root") == 0) errx(EX_DATAERR, "cannot remove user 'root'"); - if (!PWALTDIR()) { + if (PWALTDIR() != PWF_ALT) { /* Remove crontabs */ - snprintf(file, sizeof(file), "/var/cron/tabs/%s", pwd->pw_name); - if (access(file, F_OK) == 0) { - const char *argv[] = { - "crontab", - "-u", - pwd->pw_name, - "-r", - NULL - }; - pid_t pid; - - if (posix_spawnp(&pid, argv[0], NULL, NULL, - (char *const *) argv, environ)) { - warn("Failed to execute '%s %s'", - argv[0], argv[1]); - } else - (void) waitpid(pid, NULL, 0); + int cfd = openat(conf.rootfd, "var/cron/tabs", O_DIRECTORY | O_CLOEXEC); + if (cfd != -1) { + unlinkat(cfd, pwd->pw_name, 0); + close(cfd); } } diff --git a/usr.sbin/pw/tests/pw_userdel_test.sh b/usr.sbin/pw/tests/pw_userdel_test.sh index 647384615fb4..23c85ef185cb 100755 --- a/usr.sbin/pw/tests/pw_userdel_test.sh +++ b/usr.sbin/pw/tests/pw_userdel_test.sh @@ -110,6 +110,23 @@ delete_at_jobs_cleanup() { rm -rf ${HOME}/var/at/jobs } +atf_test_case delete_crontab cleanup +delete_crontab_body() { + populate_root_etc_skel + + mkdir -p ${HOME}/var/cron/tabs + + atf_check -s exit:0 ${RPW} useradd foo + + atf_check -s exit:0 touch ${HOME}/var/cron/tabs/foo + atf_check -s exit:0 ${RPW} userdel foo + + [ ! -e ${HOME}/var/cron/tabs/foo ] || atf_fail "crontab not removed" +} +delete_crontab_cleanup() { + rm -rf ${HOME}/var/cron/tabs +} + 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 @@ -119,4 +136,5 @@ atf_init_test_cases() { atf_add_test_case home_shared atf_add_test_case home_regular_dir atf_add_test_case delete_at_jobs + atf_add_test_case delete_crontab }