From nobody Fri Aug 12 17:08:38 2022 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 4M499y3jfRz4Z7wW; Fri, 12 Aug 2022 17:08:38 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4M499y2dsqz3Hkg; Fri, 12 Aug 2022 17:08:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1660324118; 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=f5Ydpz999UkhM+kF17tciLzwtA8wZHhDl4ZVTgPgotI=; b=ZujlyLjoISUSiT55qTOxoszd798bw/MpzZKuMfTJWLoE0BQ8/8vnxwNkzsfSQi4Xjoi6hV gyoJhGCcghXmnb+DfgSsk9DIseVq83j25LB8H6GHFPSKVL1agRUb13uuAMCHpHCa0dPASr vVLhoQkkcYxZ2RdEVikqf2oL7OvRZVmzIutWis4PnWlYwDdYtX8huNRWDJKFPOcKRLSvk1 RYh+MFVoNzIXv2lffX+19eBIAzJf8ZdIa674Ws2HBt9PpuWHquz5jjGUhjcHV3Fj4eyZX1 3RsDA3YEOE+dxTikQTN6douG6HUImrh4vodDEXOZEl/nWYKrzhQ9y2w1V2igvA== 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 4M499y1bxTzfhG; Fri, 12 Aug 2022 17:08:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 27CH8cnS065726; Fri, 12 Aug 2022 17:08:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 27CH8cbf065725; Fri, 12 Aug 2022 17:08:38 GMT (envelope-from git) Date: Fri, 12 Aug 2022 17:08:38 GMT Message-Id: <202208121708.27CH8cbf065725@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Maxim Sobolev Subject: git: 6b3ad1d73732 - main - When -u option is used also set USER, HOME and SHELL variables. This is consistent with what other uid-morphing utilities do, i.e. jexec(1), su(1) etc. 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: sobomax X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6b3ad1d737321cf6a70e957fb15d5287c378373c Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1660324118; 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=f5Ydpz999UkhM+kF17tciLzwtA8wZHhDl4ZVTgPgotI=; b=rwr9fHvaG+rZJzQByJR301IGCmF4nxX+djwH15eJ4fAPA05E7/ybQPI6M4Dd0/mg2mFLAi +q/OqBhlACeY1I/ybcaUaEdR9CPoHKt2ZoY/Y2Xy4vaDSERfVByCh5npafHE4SP6Jo50Bf AAwTdiSgTPFQ2RRbv2T0Eeg9+ptxja1n8//nSvD+Pm6Ld6B/xAUPCqahfL+foSw0ZAtgh3 4mfDk/B+SDejCV4JH5VX6ewKvQrSH67XCC4rQiWTLJqVuFFGbsN+22FhvEna1wTpTICSqU /veIPpc8D8Qa+v2vMHdedTRm3S1qUiCoq/NhdROVOQR34RnVmEaVcca9CnPqMw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1660324118; a=rsa-sha256; cv=none; b=ATo4TbYr9SC4sXPNofSaHVctZ2WA053PH8NX2UcN2gaCQ1LGUQawZ/i64hF4G4EDf08Xwa Gcr6b4ddWTa+TQIOHDmkkTZr6lnF2dY9qpiLss4+uLPsD9ladRr9VMhMR2dXETTU0XJEpG LXw3OtCcoQHjNoae1xlIy5OIG13EXe+3QJ7fRej0Wl3TnpmioAmRbLNMrPLHQTVu2eMufC vDDgWUcFQAWKAPGsoUKe/4tL6gI3GWD3OVR2XFrGL2rQDfPSSP6bgAcn92At/k3ikQQ4Ru ikcKSDVtfHETUf2aP34SbpNhLxiZ4ZsRs0F2emVjK5F3c2P3PkOpKPCsoVsbEg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by sobomax: URL: https://cgit.FreeBSD.org/src/commit/?id=6b3ad1d737321cf6a70e957fb15d5287c378373c commit 6b3ad1d737321cf6a70e957fb15d5287c378373c Author: Maxim Sobolev AuthorDate: 2022-08-11 01:44:20 +0000 Commit: Maxim Sobolev CommitDate: 2022-08-12 17:07:56 +0000 When -u option is used also set USER, HOME and SHELL variables. This is consistent with what other uid-morphing utilities do, i.e. jexec(1), su(1) etc. MFC after: 2 weeks Reviewed by: gbe Differential Revision: https://reviews.freebsd.org/D36148 --- usr.sbin/daemon/daemon.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/usr.sbin/daemon/daemon.c b/usr.sbin/daemon/daemon.c index d8a26132223b..e8cdaa230caa 100644 --- a/usr.sbin/daemon/daemon.c +++ b/usr.sbin/daemon/daemon.c @@ -42,6 +42,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include #include @@ -465,6 +466,10 @@ restrict_process(const char *user) if (setusercontext(NULL, pw, pw->pw_uid, LOGIN_SETALL) != 0) errx(1, "failed to set user environment"); + + setenv("USER", pw->pw_name, 1); + setenv("HOME", pw->pw_dir, 1); + setenv("SHELL", *pw->pw_shell ? pw->pw_shell : _PATH_BSHELL, 1); } /*