summaryrefslogtreecommitdiff
path: root/which.c
diff options
context:
space:
mode:
authortjg <tjg>2002-08-20 15:38:52 +0000
committerToby Goodwin <toby@paccrat.org>2015-05-16 21:23:23 +0100
commitabc309bee6007ed47a2aee33705324dc9cc8050a (patch)
tree5a2f33ac9af26e52c2b2dd86d17151476e04d242 /which.c
parent456bce4845a7035515a737e3276e5390c2b6db16 (diff)
Bug: don't call ealloc(0) on systems where getgroups() doesn't
return egid (thanks Chris Siebenmann).
Diffstat (limited to 'which.c')
-rw-r--r--which.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/which.c b/which.c
index 9a6e1bb..8abdc60 100644
--- a/which.c
+++ b/which.c
@@ -37,6 +37,8 @@ static int ingidset(gid_t g) {
return 1;
return 0;
}
+#else
+#define ingidset(g) (FALSE)
#endif
/*
@@ -56,11 +58,7 @@ static bool rc_access(char *path, bool verbose) {
mask = X_ALL;
else if (uid == st.st_uid)
mask = X_USR;
-#if HAVE_GETGROUPS
else if (gid == st.st_gid || ingidset(st.st_gid))
-#else
- else if (gid == st.st_gid)
-#endif
mask = X_GRP;
else
mask = X_OTH;
@@ -93,10 +91,12 @@ extern char *which(char *name, bool verbose) {
rc_exit(1);
}
#else
- ngroups = NGROUPS;
+ ngroups = NGROUPS;
#endif
- gidset = ealloc(ngroups * sizeof(GETGROUPS_T));
- getgroups(ngroups, gidset);
+ if (ngroups) {
+ gidset = ealloc(ngroups * sizeof(GETGROUPS_T));
+ getgroups(ngroups, gidset);
+ }
#endif
}
if (isabsolute(name)) /* absolute pathname? */