emo/shadow
1
0
Fork 0
Code Issues Pull Requests Packages Releases Activity

* src/su.c: Define shellstr before the environment so that

Browse Source 
restricted_shell is called only once. This will allow moving the
	environment definition after the switch to the new user.
This commit is contained in:
nekral-guest 2011-06-13 18:26:10 +00:00
parent 2f71935616
commit dc90c77285
2 changed files with 33 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -13,6 +13,9 @@
reset to false). reset to false).
* src/su.c: No need to change the user's shell in case of * src/su.c: No need to change the user's shell in case of
subsystem root. Update the comments. subsystem root. Update the comments.
* src/su.c: Define shellstr before the environment so that
restricted_shell is called only once. This will allow moving the
environment definition after the switch to the new user.
2011-06-10 Nicolas François <nicolas.francois@centraliens.net> 2011-06-10 Nicolas François <nicolas.francois@centraliens.net>

62
src/su.c
View File

@ -804,10 +804,37 @@ int main (int argc, char **argv)
goto top; /* authenticate in the subsystem */ goto top; /* authenticate in the subsystem */
} }
/* If su is not called by root, and the target user has a restricted /* If the user do not want to change the environment,
* shell, the environment must be changed. * use the current SHELL.
* (unless another shell is required by the command line)
*/ */
change_environment |= (restricted_shell (pwent.pw_shell) && !amroot); if ((NULL == shellstr) && !change_environment) {
shellstr = getenv ("SHELL");
}
/* If su is not called by root, and the target user has a
* restricted shell, the environment must be changed and the shell
* must be the one specified in /etc/passwd.
*/
if ( !amroot
&& restricted_shell (pwent.pw_shell)) {
shellstr = NULL;
change_environment = true;
}
/* If the shell is not set at this time, use the shell specified
* in /etc/passwd.
*/
if (NULL == shellstr) {
shellstr = (char *) strdup (pwent.pw_shell);
}
/*
* Set the default shell.
*/
if ((NULL == shellstr) || ('\0' == shellstr[0])) {
shellstr = SHELL;
}
/* /*
* If a new login is being set up, the old environment will be * If a new login is being set up, the old environment will be
@ -870,35 +897,6 @@ int main (int argc, char **argv)
} }
} }
/* If the user do not want to change the environment,
* use the current SHELL.
* (unless another shell is required by the command line)
*/
if ((NULL == shellstr) && !change_environment) {
shellstr = getenv ("SHELL");
}
/* For users with non null UID, if this user has a restricted
* shell, the shell must be the one specified in /etc/passwd
*/
if ( (NULL != shellstr)
&& !amroot
&& restricted_shell (pwent.pw_shell)) {
shellstr = NULL;
}
/* If the shell is not set at this time, use the shell specified
* in /etc/passwd.
*/
if (NULL == shellstr) {
shellstr = (char *) strdup (pwent.pw_shell);
}
/*
* Set the default shell.
*/
if ((NULL == shellstr) || ('\0' == shellstr[0])) {
shellstr = SHELL;
}
cp = getdef_str ((pwent.pw_uid == 0) ? "ENV_SUPATH" : "ENV_PATH"); cp = getdef_str ((pwent.pw_uid == 0) ? "ENV_SUPATH" : "ENV_PATH");
if (NULL == cp) { if (NULL == cp) {
addenv ((pwent.pw_uid == 0) ? "PATH=/sbin:/bin:/usr/sbin:/usr/bin" : "PATH=/bin:/usr/bin", NULL); addenv ((pwent.pw_uid == 0) ? "PATH=/sbin:/bin:/usr/sbin:/usr/bin" : "PATH=/bin:/usr/bin", NULL);