From nobody Wed Sep 04 21:34:23 2024 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 4WzbNb4Z3fz5VQxd; Wed, 04 Sep 2024 21:34:23 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WzbNb43gNz4dWv; Wed, 4 Sep 2024 21:34:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1725485663; 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=LxKT3txxE8c2oinjX9cQu+9QEqd6cwaXUhryMjhIwd8=; b=vzSWibPAcrWCdmevwOrR/a1fCiorCZXZwdc3LcRGYE6wDSqnF7sM92gwF6y6nra6ob+lVK kfhBwUzWEeKq3k0jad/Y8c7If5aT1TLM7b+wYsUSK1Q8j7q+BA1zMBc/bEAJblNYYPKKrC DWlp7aaNnzbKe2eg8M3g8wHMbcqFS9laxGs3U3TNOF2WV6PYL6aPHDcui/6DVJ82gmBlX2 hvrG52Fikxza951YW6BBplJ2GRkmOptHuhlZGaIXKIv19NMowJ8VgVPGWUYvs/fsJTOLu3 BPHncA9/QawRyZYt0kKqIK62onhr61QrVSOf6eEQ20o/OR5WJvtEByzlDSa82g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725485663; a=rsa-sha256; cv=none; b=hG5TwvblidwrhI+THuw94NsDxx9UBR97favqn1dl48fqSdQ6mQyAQx+wYVR8F+mrTprnzR m7G6husB2yKhPA8vVodLZ5MhxJg33jpDz8fmVUsZGTHCEJRPIPDs+c6i7y6lBYdaSooyKU THVm6JpSssjujZ7Jbzz0+dne601SKtY5b8Aa1Yi0CMrMNV0ZsO0uw5stvHMO50bwD65WdI R3hZUqUl8uHlXrgA1RclCMIwjvG6BgDV6H4fX4yxwSSbASRh0u1x16BYeDmS63Jaiek8H+ dUJiwuK1j1SZu3R5hJqc7uTja2g8NO33/KTIS90pT/3Rm4GBcXhOj+CChLxF3Q== 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=1725485663; 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=LxKT3txxE8c2oinjX9cQu+9QEqd6cwaXUhryMjhIwd8=; b=Or0CdZeycFBaN2B44F8ysuht3hLvmzzPbrDN3JqhnPoM7AboSbJ2yYLfn2dZfH8Ik9dLpH fXH6Yr4wLZ/Vf4ImVc5+6INxmJ8y/2y5rRFvJI6U6LLp0iO77hO/BKaF3H1/jEwXMGVEfA syyU56C9gtSJ5lIpIBEYEQUTaIDvYOQCKhVjLgn+aS7ynwDDFJqbNobSF1VV+hZb6UdxkU 8f5t3gLGqhQXEU0IiXcg9vVnUlxm+b6pxE5Wwwad3aOx5dX0HwEtcfe2mgg6LCUdzc1BJ7 KM6PiqdBkFTdTBad9pfiQ/G/jHdiO/ferGOoNnfs2SUwX5XFuwU3MYc6QCjQcw== 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 4WzbNb3fdyzh4p; Wed, 4 Sep 2024 21:34:23 +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 484LYNKs003680; Wed, 4 Sep 2024 21:34:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 484LYNrq003677; Wed, 4 Sep 2024 21:34:23 GMT (envelope-from git) Date: Wed, 4 Sep 2024 21:34:23 GMT Message-Id: <202409042134.484LYNrq003677@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Tetlow Subject: git: 86d01789bf41 - releng/14.1 - calendar: don't setlogin(2) in the -a user handlers 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 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gordon X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.1 X-Git-Reftype: branch X-Git-Commit: 86d01789bf412b216b11021c44b60f93f6af8955 Auto-Submitted: auto-generated The branch releng/14.1 has been updated by gordon: URL: https://cgit.FreeBSD.org/src/commit/?id=86d01789bf412b216b11021c44b60f93f6af8955 commit 86d01789bf412b216b11021c44b60f93f6af8955 Author: Kyle Evans AuthorDate: 2024-08-05 18:43:56 +0000 Commit: Gordon Tetlow CommitDate: 2024-09-04 21:31:57 +0000 calendar: don't setlogin(2) in the -a user handlers As of e67975d331 ("Fix 'calendar -a' in several ways."), `calendar -a` will now fork off a new process for each user and do all of its own processing in the user's own context. As a side-effect, calendar(1) started calling setlogin(2) in each of the forked processes and inadvertently hijacked the login name for the session it was running under, which was typically not a fresh session but rather that of whatever cron/periodic run spawned it. Thus, daily and security e-mails started coming from completely arbitrary user. We could create a new session, but it appears that nothing calendar(1) does really needs the login name to be clobbered; opt to just avoid the setlogin(2) call entirely rather than incur the overhead of a new session for each process. PR: 280418 Reviewed by: des, olce Fixes: e67975d331 ("Fix 'calendar -a' in several ways.") (cherry picked from commit 6cb8b61efe8899ee9194563108d0ae90c1eb89e3) (cherry picked from commit 33708452aaabca205d81eceb83e0813e5882815c) Approved by: so --- usr.bin/calendar/calendar.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.bin/calendar/calendar.c b/usr.bin/calendar/calendar.c index 476c0495d218..2e3baee7d57f 100644 --- a/usr.bin/calendar/calendar.c +++ b/usr.bin/calendar/calendar.c @@ -224,7 +224,7 @@ main(int argc, char *argv[]) lc = login_getpwclass(pw); if (setusercontext(lc, pw, pw->pw_uid, - LOGIN_SETALL) != 0) + LOGIN_SETALL & ~LOGIN_SETLOGIN) != 0) errx(1, "setusercontext"); setenv("HOME", pw->pw_dir, 1); cal();