git: f6512d13154a - stable/12 - init(8): set environment variables from the "daemon" class as well

[Kyle Evans]

The branch stable/12 has been updated by kevans:

URL: https://cgit.FreeBSD.org/src/commit/?id=f6512d13154acdd324b09a5db8dc56a4dfeca27a

commit f6512d13154acdd324b09a5db8dc56a4dfeca27a
Author:     Andrew Gierth <andrew at tao11.riddles.org.uk>
AuthorDate: 2020-02-05 04:27:44 +0000
Commit:     Kyle Evans <kevans at FreeBSD.org>
CommitDate: 2021-02-04 03:14:19 +0000

    init(8): set environment variables from the "daemon" class as well
    
    Specifically, when running /etc/rc. This allows one to specify via
    login.conf(5) an environment that should be used when running services to
    ease, e.g., setting up env vars for an HTTP proxy consistently across cron
    and services alike.
    
    Future changes will extend cron(8)/service(8) to use environment vars
    pecified in login.conf(5) as well to promote a more cohesive experience.
    
    This is a part of D21481.
    
    (cherry picked from commit 21c1a93c048fdd9c276899e72dcb8dc93cc18e09)
---
 sbin/init/init.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/sbin/init/init.c b/sbin/init/init.c
index 4b75e5763c8d..1bb35dbe5803 100644
--- a/sbin/init/init.c
+++ b/sbin/init/init.c
@@ -2033,6 +2033,7 @@ setprocresources(const char *cname)
 	login_cap_t *lc;
 	if ((lc = login_getclassbyname(cname, NULL)) != NULL) {
 		setusercontext(lc, (struct passwd*)NULL, 0,
+		    LOGIN_SETENV |
 		    LOGIN_SETPRIORITY | LOGIN_SETRESOURCES |
 		    LOGIN_SETLOGINCLASS | LOGIN_SETCPUMASK);
 		login_close(lc);