}
/* this function is a definate candidate for a faster algorithm */
-static uid_t match_uid(uid_t uid)
+uid_t match_uid(uid_t uid)
{
static uid_t last_in, last_out;
struct idlist *list;
return last_out = uid;
}
-static gid_t match_gid(gid_t gid)
+gid_t match_gid(gid_t gid)
{
static gid_t last_in = GID_NONE, last_out = GID_NONE;
struct idlist *list;
}
/* Add a uid to the list of uids. Only called on sending side. */
-void add_uid(uid_t uid)
+char *add_uid(uid_t uid)
{
struct idlist *list;
+ struct idlist *node;
if (uid == 0) /* don't map root */
- return;
+ return NULL;
for (list = uidlist; list; list = list->next) {
if (list->id == (int)uid)
- return;
+ return NULL;
}
- add_to_list(&uidlist, (int)uid, uid_to_name(uid), 0);
+ node = add_to_list(&uidlist, (int)uid, uid_to_name(uid), 0);
+ return node->name;
}
/* Add a gid to the list of gids. Only called on sending side. */
-void add_gid(gid_t gid)
+char *add_gid(gid_t gid)
{
struct idlist *list;
+ struct idlist *node;
if (gid == 0) /* don't map root */
- return;
+ return NULL;
for (list = gidlist; list; list = list->next) {
if (list->id == (int)gid)
- return;
+ return NULL;
}
- add_to_list(&gidlist, (int)gid, gid_to_name(gid), 0);
+ node = add_to_list(&gidlist, (int)gid, gid_to_name(gid), 0);
+ return node->name;
}
/* send a complete uid/gid mapping to the peer */
}
}
-static uid_t recv_user_name(int f, uid_t uid)
+uid_t recv_user_name(int f, uid_t uid)
{
int len = read_byte(f);
char *name = new_array(char, len+1);
return recv_add_uid(uid, name); /* node keeps name's memory */
}
-static gid_t recv_group_name(int f, gid_t gid)
+gid_t recv_group_name(int f, gid_t gid)
{
int len = read_byte(f);
char *name = new_array(char, len+1);
/* Now convert all the uids/gids from sender values to our values. */
if (am_root && preserve_uid && !numeric_ids) {
for (i = 0; i < flist->count; i++)
- F_UID(flist->files[i]) = match_uid(F_UID(flist->files[i]));
+ F_OWNER(flist->files[i]) = match_uid(F_UID(flist->files[i]));
}
if (preserve_gid && (!am_root || !numeric_ids)) {
for (i = 0; i < flist->count; i++)
- F_GID(flist->files[i]) = match_gid(F_GID(flist->files[i]));
+ F_GROUP(flist->files[i]) = match_gid(F_GID(flist->files[i]));
}
}