Don't set LOGNAME

LOGNAME is a SysV thing. This is a BSD program.
This commit is contained in:
C. McEnroe 2020-08-16 17:32:23 -04:00
parent 7d04a0f5e0
commit daac7db044
3 changed files with 3 additions and 7 deletions

View File

@ -1,4 +1,4 @@
.Dd August 15, 2020 .Dd August 16, 2020
.Dt CATSITD 8 .Dt CATSITD 8
.Os .Os
. .
@ -172,7 +172,7 @@ Services are started
with empty environments with empty environments
apart from the following: apart from the following:
.Bl -tag -width Ds .Bl -tag -width Ds
.It Ev LOGNAME , Ev USER .It Ev USER
Set to the name of the user specified by Set to the name of the user specified by
.Fl u . .Fl u .
.It Ev HOME .It Ev HOME

View File

@ -242,10 +242,7 @@ int main(int argc, char *argv[]) {
serviceUID = user->pw_uid; serviceUID = user->pw_uid;
serviceGID = group->gr_gid; serviceGID = group->gr_gid;
int len = asprintf(&serviceEnviron[LOGNAME], "LOGNAME=%s", user->pw_name); int len = asprintf(&serviceEnviron[USER], "USER=%s", user->pw_name);
if (len < 0) err(EX_OSERR, "asprintf");
len = asprintf(&serviceEnviron[USER], "USER=%s", user->pw_name);
if (len < 0) err(EX_OSERR, "asprintf"); if (len < 0) err(EX_OSERR, "asprintf");
len = asprintf(&serviceEnviron[HOME], "HOME=%s", user->pw_dir); len = asprintf(&serviceEnviron[HOME], "HOME=%s", user->pw_dir);

View File

@ -91,7 +91,6 @@ static inline const char *lineRead(struct Line *line, int fd) {
enum { enum {
SHELL, SHELL,
PATH, PATH,
LOGNAME,
USER, USER,
HOME, HOME,
EnvironNull, EnvironNull,