extern int preserve_uid;
extern int preserve_gid;
extern int numeric_ids;
+extern int am_root;
struct idlist {
struct idlist *next;
static struct idlist *add_list(int id, char *name)
{
- struct idlist *list = (struct idlist *)malloc(sizeof(list[0]));
+ struct idlist *list = new(struct idlist);
if (!list) out_of_memory("add_list");
list->next = NULL;
list->name = strdup(name);
return NULL;
}
-
-/* turn a user name into a uid */
-static uid_t name_to_uid(char *name)
-{
- struct passwd *pass;
- if (!name || !*name) return 0;
- pass = getpwnam(name);
- if (pass) return(pass->pw_uid);
- return 0;
-}
-
-/* turn a group name into a gid */
-static gid_t name_to_gid(char *name)
-{
- struct group *grp;
- if (!name || !*name) return 0;
- grp = getgrnam(name);
- if (grp) return(grp->gr_gid);
- return 0;
-}
-
static int map_uid(int id, char *name)
{
- uid_t uid = name_to_uid(name);
- if (uid != 0) return uid;
+ uid_t uid;
+ if (name_to_uid(name, &uid) && uid != 0)
+ return uid;
return id;
}
static int map_gid(int id, char *name)
{
- gid_t gid = name_to_gid(name);
- if (gid != 0) return gid;
+ gid_t gid;
+ if (name_to_gid(name, &gid) && gid != 0)
+ return gid;
return id;
}
return last_out;
}
+static int is_in_group(gid_t gid)
+{
+#ifdef GETGROUPS_T
+ static gid_t last_in = (gid_t) -2, last_out;
+ static int ngroups = -2;
+ static GETGROUPS_T *gidset;
+ int n;
+
+ if (gid == last_in)
+ return last_out;
+ if (ngroups < -1) {
+ /* treat failure (-1) as if not member of any group */
+ ngroups = getgroups(0, 0);
+ if (ngroups > 0) {
+ gidset = new_array(GETGROUPS_T, ngroups);
+ ngroups = getgroups(ngroups, gidset);
+ }
+ }
+
+ last_in = gid;
+ last_out = 0;
+ for (n = 0; n < ngroups; n++) {
+ if (gidset[n] == gid) {
+ last_out = 1;
+ break;
+ }
+ }
+ return last_out;
+
+#else
+ return 0;
+#endif
+}
+
static gid_t match_gid(gid_t gid)
{
static gid_t last_in, last_out;
list = list->next;
}
- last_out = gid;
+ if (am_root)
+ last_out = gid;
+ else
+ last_out = GID_NONE;
return last_out;
}
if (preserve_uid) {
/* read the uid list */
list = uidlist;
- id = read_int(f);
- while (id != 0) {
+ while ((id = read_int(f)) != 0) {
int len = read_byte(f);
- name = (char *)malloc(len);
+ name = new_array(char, len+1);
if (!name) out_of_memory("recv_uid_list");
- read_buf(f, name, len);
+ read_sbuf(f, name, len);
if (!list) {
uidlist = add_list(id, name);
list = uidlist;
}
list->id2 = map_uid(id, name);
free(name);
- id = read_int(f);
}
}
if (preserve_gid) {
/* and the gid list */
list = gidlist;
- id = read_int(f);
- while (id != 0) {
+ while ((id = read_int(f)) != 0) {
int len = read_byte(f);
- name = (char *)malloc(len);
+ name = new_array(char, len+1);
if (!name) out_of_memory("recv_uid_list");
- read_buf(f, name, len);
+ read_sbuf(f, name, len);
if (!list) {
gidlist = add_list(id, name);
list = gidlist;
list = list->next;
}
list->id2 = map_gid(id, name);
+ if (!am_root && !is_in_group(list->id2))
+ list->id2 = GID_NONE;
free(name);
- id = read_int(f);
}
}
- if (!uidlist && !gidlist) return;
+ if (!(am_root && preserve_uid) && !preserve_gid) return;
/* now convert the uid/gid of all files in the list to the mapped
uid/gid */
for (i=0;i<flist->count;i++) {
- if (preserve_uid && flist->files[i]->uid != 0) {
+ if (am_root && preserve_uid && flist->files[i]->uid != 0) {
flist->files[i]->uid = match_uid(flist->files[i]->uid);
}
if (preserve_gid && flist->files[i]->gid != 0) {