From 0ad2ceadc06a4289092d222c8a538fc28f5039d8 Mon Sep 17 00:00:00 2001 From: Karel Zak Date: Wed, 7 May 2025 12:06:21 +0200 Subject: [PATCH] login: use logindefs_setenv_path() Signed-off-by: Karel Zak --- login-utils/login.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/login-utils/login.c b/login-utils/login.c index 321f9d6ce..b77a8040f 100644 --- a/login-utils/login.c +++ b/login-utils/login.c @@ -1212,14 +1212,8 @@ static void init_environ(struct login_context *cxt) xsetenv("USER", pwd->pw_name, 1); xsetenv("SHELL", pwd->pw_shell, 1); - if (pwd->pw_uid) { - if (logindefs_setenv("PATH", "ENV_PATH", _PATH_DEFPATH) != 0) - err(EXIT_FAILURE, _("failed to set the %s environment variable"), "PATH"); - - } else if (logindefs_setenv("PATH", "ENV_ROOTPATH", NULL) != 0 && - logindefs_setenv("PATH", "ENV_SUPATH", _PATH_DEFPATH_ROOT) != 0) { - err(EXIT_FAILURE, _("failed to set the %s environment variable"), "PATH"); - } + if (logindefs_setenv_path(pwd->pw_uid) != 0) + err(EXIT_FAILURE, _("failed to set the PATH environment variable")); /* mailx will give a funny error msg if you forget this one */ len = snprintf(tmp, sizeof(tmp), "%s/%s", _PATH_MAILDIR, pwd->pw_name); -- 2.47.3