diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2017-07-18 17:26:33 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2017-07-21 15:00:43 +0100 |
| commit | 4a65a86af64cc3247f1def97692c9b78b7cfc401 (patch) | |
| tree | c433a0e113880f28a8628277fb50ff258658bf07 /bsd-user | |
| parent | c8115f8eb8b6c4742e5e0c0c644904cd81ed65fa (diff) | |
| download | qemu-4a65a86af64cc3247f1def97692c9b78b7cfc401.zip qemu-4a65a86af64cc3247f1def97692c9b78b7cfc401.tar.gz qemu-4a65a86af64cc3247f1def97692c9b78b7cfc401.tar.bz2 | |
bsd-user/bsdload.c: Remove write-only id_change variable
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 331c23b5ca44293d1 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
Diffstat (limited to 'bsd-user')
| -rw-r--r-- | bsd-user/bsdload.c | 25 |
1 files changed, 1 insertions, 24 deletions
diff --git a/bsd-user/bsdload.c b/bsd-user/bsdload.c index 94eec36..f38c4fa 100644 --- a/bsd-user/bsdload.c +++ b/bsd-user/bsdload.c @@ -20,22 +20,6 @@ abi_long memcpy_to_target(abi_ulong dest, const void *src, 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) { int i; @@ -51,7 +35,7 @@ static int prepare_binprm(struct linux_binprm *bprm) { struct stat st; int mode; - int retval, id_change; + int retval; if(fstat(bprm->fd, &st) < 0) { return(-errno); @@ -67,14 +51,10 @@ static int prepare_binprm(struct linux_binprm *bprm) bprm->e_uid = geteuid(); bprm->e_gid = getegid(); - id_change = 0; /* Set-uid? */ if(mode & S_ISUID) { bprm->e_uid = st.st_uid; - if(bprm->e_uid != geteuid()) { - id_change = 1; - } } /* Set-gid? */ @@ -85,9 +65,6 @@ static int prepare_binprm(struct linux_binprm *bprm) */ if ((mode & (S_ISGID | S_IXGRP)) == (S_ISGID | S_IXGRP)) { bprm->e_gid = st.st_gid; - if (!in_group_p(bprm->e_gid)) { - id_change = 1; - } } memset(bprm->buf, 0, sizeof(bprm->buf)); |