mirror of
https://github.com/freebsd/freebsd-src
synced 2024-10-04 07:31:11 +00:00
sh: Remove duplicate code resetting uid/gid for set +p/+o privileged.
MFC after: 1 week
This commit is contained in:
parent
bffd599bc9
commit
b7b23db5e2
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=221011
|
@ -198,13 +198,8 @@ options(int cmdline)
|
|||
minus_o(*argptr, val);
|
||||
if (*argptr)
|
||||
argptr++;
|
||||
} else {
|
||||
if (c == 'p' && !val && privileged) {
|
||||
(void) setuid(getuid());
|
||||
(void) setgid(getgid());
|
||||
}
|
||||
} else
|
||||
setoption(c, val);
|
||||
}
|
||||
}
|
||||
}
|
||||
return;
|
||||
|
@ -271,10 +266,6 @@ minus_o(char *name, int val)
|
|||
} else {
|
||||
for (i = 0; i < NOPTS; i++)
|
||||
if (equal(name, optlist[i].name)) {
|
||||
if (!val && privileged && equal(name, "privileged")) {
|
||||
(void) setuid(getuid());
|
||||
(void) setgid(getgid());
|
||||
}
|
||||
setoption(optlist[i].letter, val);
|
||||
return;
|
||||
}
|
||||
|
@ -288,6 +279,10 @@ setoption(int flag, int val)
|
|||
{
|
||||
int i;
|
||||
|
||||
if (flag == 'p' && !val && privileged) {
|
||||
(void) setuid(getuid());
|
||||
(void) setgid(getgid());
|
||||
}
|
||||
for (i = 0; i < NOPTS; i++)
|
||||
if (optlist[i].letter == flag) {
|
||||
optlist[i].val = val;
|
||||
|
|
Loading…
Reference in a new issue