Merge Debian's patch 451_login_PATH
* NEWS, libmisc/setupenv.c: Export PATH according to ENV_PATH and ENV_SUPATH, as for su. This impacts login. * man/login.1.xml: PATH and SUPATH are now used both when PAM support is disabled and enabled.
This commit is contained in:
@ -186,8 +186,8 @@ void setup_env (struct passwd *info)
|
||||
{
|
||||
#ifndef USE_PAM
|
||||
char *envf;
|
||||
char *cp;
|
||||
#endif
|
||||
char *cp;
|
||||
|
||||
/*
|
||||
* Change the current working directory to be the home directory
|
||||
@ -242,7 +242,6 @@ void setup_env (struct passwd *info)
|
||||
addenv ("USER", info->pw_name);
|
||||
addenv ("LOGNAME", info->pw_name);
|
||||
|
||||
#ifndef USE_PAM
|
||||
/*
|
||||
* Create the PATH environmental variable and export it.
|
||||
*/
|
||||
@ -260,6 +259,7 @@ void setup_env (struct passwd *info)
|
||||
addenv ("PATH", cp);
|
||||
}
|
||||
|
||||
#ifndef USE_PAM
|
||||
/*
|
||||
* Create the MAIL environmental variable and export it. login.defs
|
||||
* knows the prefix.
|
||||
|
Reference in New Issue
Block a user