#include "rsync.h"
-#ifdef GETGROUPS_T
+#ifdef HAVE_GETGROUPS
+# if !defined(GETGROUPS_T)
+# define GETGROUPS_T gid_t
+# endif
# ifndef NGROUPS_MAX
/* It ought to be defined, but just in case. */
# define NGROUPS_MAX 32
static int is_in_group(gid_t gid)
{
-#ifdef GETGROUPS_T
+#ifdef HAVE_GETGROUPS
static gid_t last_in = GID_NONE, last_out;
static int ngroups = -2;
static GETGROUPS_T *gidset;
if (gid == last_in)
return last_out;
if (ngroups < -1) {
- gid_t mygid = getgid();
- ngroups = getgroups(0, 0);
- /* If that didn't work, perhaps 0 isn't treated specially? */
- if (ngroups <= 0)
- ngroups = NGROUPS_MAX;
+ gid_t mygid = MY_GID();
+ if ((ngroups = getgroups(0, 0)) < 0)
+ ngroups = 0;
gidset = new_array(GETGROUPS_T, ngroups+1);
if (ngroups > 0)
ngroups = getgroups(ngroups, gidset);
if (n == ngroups)
gidset[ngroups++] = mygid;
if (verbose > 3) {
+ char gidbuf[NGROUPS_MAX*16+32];
+ int pos;
+ sprintf(gidbuf, "process has %d gid%s: ",
+ ngroups, ngroups == 1? "" : "s");
+ pos = strlen(gidbuf);
for (n = 0; n < ngroups; n++) {
- rprintf(FINFO, "process gid %d: %ld\n",
- n, (long)gidset[n]);
+ sprintf(gidbuf+pos, " %ld", (long)gidset[n]);
+ pos += strlen(gidbuf+pos);
}
+ rprintf(FINFO, "%s\n", gidbuf);
}
}
#else
static gid_t mygid = GID_NONE;
- if (mygid == GID_NONE)
- mygid = getgid();
+ if (mygid == GID_NONE) {
+ mygid = MY_GID();
+ if (verbose > 3)
+ rprintf(FINFO, "process has gid %ld\n", (long)mygid);
+ }
return gid == mygid;
#endif
}
list = list->next;
}
- if (am_root)
+ if (am_root || is_in_group(gid))
last_out = gid;
else
last_out = GID_NONE;
}
if (verbose > 3) {
for (list = uidlist; list; list = list->next) {
- rprintf(FINFO, "uid %s (%ld) maps to %ld\n",
- list->name, (long)list->id,
+ rprintf(FINFO, "uid %ld (%s) maps to %ld\n",
+ (long)list->id, list->name,
(long)list->id2);
}
}
}
if (verbose > 3) {
for (list = gidlist; list; list = list->next) {
- rprintf(FINFO, "gid %s (%ld) maps to %ld\n",
- list->name, (long)list->id,
+ rprintf(FINFO, "gid %ld (%s) maps to %ld\n",
+ (long)list->id, list->name,
(long)list->id2);
}
}