Commit a2687b64 authored by Wayne Davison's avatar Wayne Davison

Added a little more compatibility code for non-standard systems.

parent c284f34a
...@@ -97,7 +97,8 @@ static uid_t match_uid(uid_t uid) ...@@ -97,7 +97,8 @@ static uid_t match_uid(uid_t uid)
static uid_t last_in, last_out; static uid_t last_in, last_out;
struct idlist *list = uidlist; struct idlist *list = uidlist;
if (uid == last_in) return last_out; if (uid == last_in)
return last_out;
last_in = uid; last_in = uid;
...@@ -116,7 +117,7 @@ static uid_t match_uid(uid_t uid) ...@@ -116,7 +117,7 @@ static uid_t match_uid(uid_t uid)
static int is_in_group(gid_t gid) static int is_in_group(gid_t gid)
{ {
#ifdef GETGROUPS_T #ifdef GETGROUPS_T
static gid_t last_in = (gid_t) -2, last_out; static gid_t last_in = GID_NONE, last_out;
static int ngroups = -2; static int ngroups = -2;
static GETGROUPS_T *gidset; static GETGROUPS_T *gidset;
int n; int n;
...@@ -127,7 +128,7 @@ static int is_in_group(gid_t gid) ...@@ -127,7 +128,7 @@ static int is_in_group(gid_t gid)
gid_t mygid = getgid(); gid_t mygid = getgid();
ngroups = getgroups(0, 0); ngroups = getgroups(0, 0);
/* If that didn't work, perhaps 0 isn't treated specially? */ /* If that didn't work, perhaps 0 isn't treated specially? */
if (ngroups < 0) if (ngroups <= 0)
ngroups = NGROUPS_MAX; ngroups = NGROUPS_MAX;
gidset = new_array(GETGROUPS_T, ngroups+1); gidset = new_array(GETGROUPS_T, ngroups+1);
if (ngroups > 0) if (ngroups > 0)
...@@ -142,26 +143,27 @@ static int is_in_group(gid_t gid) ...@@ -142,26 +143,27 @@ static int is_in_group(gid_t gid)
} }
last_in = gid; last_in = gid;
last_out = 0;
for (n = 0; n < ngroups; n++) { for (n = 0; n < ngroups; n++) {
if (gidset[n] == gid) { if (gidset[n] == gid)
last_out = 1; return last_out = 1;
break;
}
} }
return last_out; return last_out = 0;
#else #else
return 0; static gid_t mygid = GID_NONE;
if (mygid == GID_NONE)
mygid = getgid();
return gid == mygid;
#endif #endif
} }
static gid_t match_gid(gid_t gid) static gid_t match_gid(gid_t gid)
{ {
static gid_t last_in = (gid_t) -2, last_out; static gid_t last_in = GID_NONE, last_out = GID_NONE;
struct idlist *list = gidlist; struct idlist *list = gidlist;
if (gid == last_in) return last_out; if (gid == last_in)
return last_out;
last_in = gid; last_in = gid;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment