From nobody Fri Sep 04 14:28:55 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 4hbzNl2yJqz6qmKt for ; Fri, 04 Sep 2026 14:28:55 +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 4hbzNl2NHwz3TQB for ; Fri, 04 Sep 2026 14:28:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1788532135; 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=UaHytV0tnSRlgNlcUJ+n7D5bp9eOjSIotqAeRtcg/ns=; b=dCxMh6UTdY0UI72cmnoqxwXTJTSu1ZS7pWDfQfb1Zkm3k1CJHHz20GZ1cse63wU1JAaGcR qAWyQySPmfpsKUrRa73SvAusCb47MZ1vE5nNTddS8PBnUwKhC+1hGfATsEz0Wtbj9lpPtg T9Cuu5vt7SD9P0rwWyiwxU58xbsjIt5IQbBUsiLD9x/vy+MViQpJ7X1QhckrbXMdLab3Yo OBpmvvuVQVxSXHmAwnlCELUBOhCYy48w0DnL6ZntKCtnqxX1Zht1+bRDMeB9E6wDrs4PWr Jh+i+YFhDIopGFH4Qo1OxuDCSzn0peQVmXBTJYhDBiP1btqr46VmCMFcevQCzg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1788532135; a=rsa-sha256; cv=none; b=FSXViBdM2dFBxeBMASTQIew2OLhL7Er+nAmJcOSfqd4jB6o7o5cgIWqUGDlM1e5fi1l/qL DfbrLLj5UWk3uq3/Tz4c+fxoaUvLurm1AdK2s2Jqr0APFcnPpp+zfy9T5bb4Hm0qpBzCzt If4q7gqtQUgUOlIug7dlVgq2Vt1Mlg426AXQCqcyh0Q+loHA9sXLmrI3GcFBo5y5HnjnMz uY0XR7VID+KeQOboOcAM7vSAx+lk2C/q5XAe6M/pw4BPutViPeiEfHl/D2176fb/KWAzu8 972ANv0DgkTKsH/lAx7LDfuBdgQA+Xwqlxko+DqwHOqHZ/ryOQtvcTXZOjVFAg== 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=1788532135; 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=UaHytV0tnSRlgNlcUJ+n7D5bp9eOjSIotqAeRtcg/ns=; b=jTFJn/rQy3i6Nw5ACsTD4uPBH6UwfkyTQCoCP6gAHGp84OKL/OtIJP4p0bL7+1I4U2Al6j KqWP3P00vWpdoFJjEek1Ihjkx9ezhbzqwCFaYlCF0yWumPALlhpfHuw1xewfGNvv+er/9g 6UTeznXBz3gbRPJS2T+h+KmgI2pDrb58ObNGTbc0HsV77DZXCSnGByo0hTIiTWt48zvpbw fg3SeISS+fZezNLUCxsIRqmNjcCtDiDWoLEQc8hOMaZah8W9IUdI/GEG1+8OpSp1zcNep6 kZ/my9M+7lPdpm7MnO2eFuc7hGW61yvpQhhlDe0BG2NH0/nRzy3GatDnrgcnvA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hbzNl18w1z12xc for ; Fri, 04 Sep 2026 14:28:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 360ce by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 04 Sep 2026 14:28:55 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Baptiste Daroussin Subject: git: 5f5a1657a921 - main - pw: cleanup 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: 5f5a1657a921c3f7a84ef326c2116d986409e161 Auto-Submitted: auto-generated Date: Fri, 04 Sep 2026 14:28:55 +0000 Message-Id: <6a9ad5a7.360ce.341317b5@gitrepo.freebsd.org> The branch main has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=5f5a1657a921c3f7a84ef326c2116d986409e161 commit 5f5a1657a921c3f7a84ef326c2116d986409e161 Author: Baptiste Daroussin AuthorDate: 2026-09-04 11:43:22 +0000 Commit: Baptiste Daroussin CommitDate: 2026-09-04 14:28:46 +0000 pw: cleanup No functional change intended. MFC After: 1 week --- usr.sbin/pw/pw_user.c | 47 +++++++++++++++++++++++------------------------ 1 file changed, 23 insertions(+), 24 deletions(-) diff --git a/usr.sbin/pw/pw_user.c b/usr.sbin/pw/pw_user.c index e2b84b2a83d3..269344232912 100644 --- a/usr.sbin/pw/pw_user.c +++ b/usr.sbin/pw/pw_user.c @@ -681,33 +681,32 @@ static void rmat(uid_t uid) { DIR *d = opendir("/var/at/jobs"); + struct dirent *e; + const char *argv[] = { "/usr/sbin/atrm", NULL, NULL }; - if (d != NULL) { - struct dirent *e; - - while ((e = readdir(d)) != NULL) { - struct stat st; - pid_t pid; - - if (strncmp(e->d_name, ".lock", 5) != 0 && - stat(e->d_name, &st) == 0 && - !S_ISDIR(st.st_mode) && - st.st_uid == uid) { - const char *argv[] = { - "/usr/sbin/atrm", - e->d_name, - NULL - }; - if (posix_spawn(&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); - } + if (d == NULL) + return; + + while ((e = readdir(d)) != NULL) { + struct stat st; + pid_t pid; + + if (strncmp(e->d_name, ".lock", 5) == 0) + continue; + if (stat(e->d_name, &st) != 0) + continue; + if (S_ISDIR(st.st_mode) || st.st_uid != uid) + continue; + argv[1] = e->d_name; + if (posix_spawn(&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); } - closedir(d); } + closedir(d); } int