emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix breakage found by mass one-applet builds

Browse Source 
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko
2016-12-23 02:42:26 +01:00
parent 7c5dea399b
commit 9cc3d3ab21
8 changed files with 29 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
libbb/appletlib.c
View File

@ -329,21 +329,6 @@ static struct suid_config_t {
static bool suid_cfg_readable;
/* check if u is member of group g */
static int ingroup(uid_t u, gid_t g)
{
struct group *grp = getgrgid(g);
if (grp) {
char **mem;
for (mem = grp->gr_mem; *mem; mem++) {
struct passwd *pwd = getpwnam(*mem);
if (pwd && (pwd->pw_uid == u))
return 1;
}
}
return 0;
}
/* libbb candidate */
static char *get_trimmed_slice(char *s, char *e)
{
@ -568,7 +553,22 @@ static inline void parse_config_file(void)
# endif /* FEATURE_SUID_CONFIG */
# if ENABLE_FEATURE_SUID
# if ENABLE_FEATURE_SUID && NUM_APPLETS > 0
/* check if u is member of group g */
static int ingroup(uid_t u, gid_t g)
{
struct group *grp = getgrgid(g);
if (grp) {
char **mem;
for (mem = grp->gr_mem; *mem; mem++) {
struct passwd *pwd = getpwnam(*mem);
if (pwd && (pwd->pw_uid == u))
return 1;
}
}
return 0;
}
static void check_suid(int applet_no)
{
gid_t rgid; /* real gid */