extern int preserve_uid;
extern int preserve_gid;
extern int numeric_ids;
+extern int am_root;
struct idlist {
struct idlist *next;
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;
}
list = list->next;
}
- last_out = gid;
+ if (am_root)
+ last_out = gid;
+ else
+ last_out = (gid_t) -1;
return last_out;
}
id = read_int(f);
while (id != 0) {
int len = read_byte(f);
- name = (char *)malloc(len);
+ name = (char *)malloc(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;
id = read_int(f);
while (id != 0) {
int len = read_byte(f);
- name = (char *)malloc(len);
+ name = (char *)malloc(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;
}
}
- 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) {
- flist->files[i].uid = match_uid(flist->files[i].uid);
+ 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) {
- flist->files[i].gid = match_gid(flist->files[i].gid);
+ if (preserve_gid && flist->files[i]->gid != 0) {
+ flist->files[i]->gid = match_gid(flist->files[i]->gid);
}
}
}