upstream commit

Revert previous commit.  We still want to call setgroups
 in the case where there are zero groups to remove any that we might otherwise
 inherit (as pointed out by grawity at gmail.com) and since the 2nd argument
 to setgroups is always a static global it's always valid to dereference in
 this case.  ok deraadt@ djm@

Upstream-ID: 895b5ac560a10befc6b82afa778641315725fd01
This commit is contained in:
dtucker@openbsd.org 2015-06-24 01:49:19 +00:00 committed by Damien Miller
parent 882f8bf94f
commit 7ed01a96a1
1 changed files with 1 additions and 2 deletions

View File

@ -187,8 +187,7 @@ restore_uid(void)
setgid(getgid());
#endif /* SAVED_IDS_WORK_WITH_SETEUID */
if (saved_egroupslen > 0 &&
setgroups(saved_egroupslen, saved_egroups) < 0)
if (setgroups(saved_egroupslen, saved_egroups) < 0)
fatal("setgroups: %.100s", strerror(errno));
temporarily_use_uid_effective = 0;
}