mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bsd-user/bsdload.c: Remove write-only id_change variable

Browse Source 
On OpenBSD the compiler complains:
bsd-user/bsdload.c:54:17: warning: variable 'id_change' set but not used [-Wunused-but-set-variable]

This is dead code that was originally copied from linux-user.
We fixed this in linux-user in commit 331c23b5ca in 2011;
delete the useless code from bsd-user too.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Message-id: 1500395194-21455-4-git-send-email-peter.maydell@linaro.org
This commit is contained in:
Peter Maydell 2017-07-18 17:26:33 +01:00
parent c8115f8eb8
commit 4a65a86af6
1 changed files with 1 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
bsd-user/bsdload.c
View File

@ -20,22 +20,6 @@ abi_long memcpy_to_target(abi_ulong dest, const void *src,
return 0; return 0;
} }
static int in_group_p(gid_t g)
{
/* return TRUE if we're in the specified group, FALSE otherwise */
int ngroup;
int i;
gid_t grouplist[TARGET_NGROUPS];
ngroup = getgroups(TARGET_NGROUPS, grouplist);
for(i = 0; i < ngroup; i++) {
if(grouplist[i] == g) {
return 1;
}
}
return 0;
}
static int count(char ** vec) static int count(char ** vec)
{ {
int i; int i;
@ -51,7 +35,7 @@ static int prepare_binprm(struct linux_binprm *bprm)
{ {
struct stat st; struct stat st;
int mode; int mode;
int retval, id_change; int retval;
if(fstat(bprm->fd, &st) < 0) { if(fstat(bprm->fd, &st) < 0) {
return(-errno); return(-errno);
@ -67,14 +51,10 @@ static int prepare_binprm(struct linux_binprm *bprm)
bprm->e_uid = geteuid(); bprm->e_uid = geteuid();
bprm->e_gid = getegid(); bprm->e_gid = getegid();
id_change = 0;
/* Set-uid? */ /* Set-uid? */
if(mode & S_ISUID) { if(mode & S_ISUID) {
bprm->e_uid = st.st_uid; bprm->e_uid = st.st_uid;
if(bprm->e_uid != geteuid()) {
id_change = 1;
}
} }
/* Set-gid? */ /* Set-gid? */
@ -85,9 +65,6 @@ static int prepare_binprm(struct linux_binprm *bprm)
*/ */
if ((mode & (S_ISGID | S_IXGRP)) == (S_ISGID | S_IXGRP)) { if ((mode & (S_ISGID | S_IXGRP)) == (S_ISGID | S_IXGRP)) {
bprm->e_gid = st.st_gid; bprm->e_gid = st.st_gid;
if (!in_group_p(bprm->e_gid)) {
id_change = 1;
}
} }
memset(bprm->buf, 0, sizeof(bprm->buf)); memset(bprm->buf, 0, sizeof(bprm->buf));