d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sh: Remove duplicate code resetting uid/gid for set +p/+o privileged.

Browse Source 
MFC after:	1 week
This commit is contained in:
Jilles Tjoelker 2011-04-25 10:08:34 +00:00
parent bffd599bc9
commit b7b23db5e2
1 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
bin/sh/options.c
View File

@ -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;