Matt McCutchen's Web Site
/
rsync
/
rsync.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use the new HAVE_GETGROUPS define.
[rsync/rsync.git]
/
uidlist.c
diff --git
a/uidlist.c
b/uidlist.c
index
e9ab35d
..
0319d60
100644
(file)
--- a/
uidlist.c
+++ b/
uidlist.c
@@
-25,7
+25,10
@@
#include "rsync.h"
#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
# ifndef NGROUPS_MAX
/* It ought to be defined, but just in case. */
# define NGROUPS_MAX 32
@@
-117,7
+120,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
HAVE_GETGROUPS
static gid_t last_in = GID_NONE, last_out;
static int ngroups = -2;
static GETGROUPS_T *gidset;
static gid_t last_in = GID_NONE, last_out;
static int ngroups = -2;
static GETGROUPS_T *gidset;
@@
-126,7
+129,7
@@
static int is_in_group(gid_t gid)
if (gid == last_in)
return last_out;
if (ngroups < -1) {
if (gid == last_in)
return last_out;
if (ngroups < -1) {
- gid_t mygid =
getgid
();
+ gid_t mygid =
MY_GID
();
ngroups = getgroups(0, 0);
/* If that didn't work, perhaps 0 isn't treated specially? */
if (ngroups <= 0)
ngroups = getgroups(0, 0);
/* If that didn't work, perhaps 0 isn't treated specially? */
if (ngroups <= 0)
@@
-142,10
+145,16
@@
static int is_in_group(gid_t gid)
if (n == ngroups)
gidset[ngroups++] = mygid;
if (verbose > 3) {
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++) {
for (n = 0; n < ngroups; n++) {
- rprintf(FINFO, "process has gid %ld\n",
-
(long)gidset[n]
);
+ sprintf(gidbuf+pos, " %ld", (long)gidset[n]);
+
pos += strlen(gidbuf+pos
);
}
}
+ rprintf(FINFO, "%s\n", gidbuf);
}
}
}
}
@@
-158,8
+167,11
@@
static int is_in_group(gid_t gid)
#else
static gid_t mygid = GID_NONE;
#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
}
return gid == mygid;
#endif
}