*
* Copyright (C) 1996 Andrew Tridgell
* Copyright (C) 1996 Paul Mackerras
- * Copyright (C) 2004, 2005, 2006 Wayne Davison
+ * Copyright (C) 2004-2007 Wayne Davison
*
* This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
extern int am_root;
extern int preserve_uid;
extern int preserve_gid;
+extern int preserve_acls;
extern int numeric_ids;
struct idlist {
{
struct idlist *list;
- if (preserve_uid) {
+ if (preserve_uid || preserve_acls) {
int len;
/* we send sequences of uid/byte-length/name */
for (list = uidlist; list; list = list->next) {
write_int(f, 0);
}
- if (preserve_gid) {
+ if (preserve_gid || preserve_acls) {
int len;
for (list = gidlist; list; list = list->next) {
if (!list->name)
{
int id, i;
- if (preserve_uid && !numeric_ids) {
+ if ((preserve_uid || preserve_acls) && !numeric_ids) {
/* read the uid list */
while ((id = read_int(f)) != 0)
recv_user_name(f, (uid_t)id);
}
- if (preserve_gid && !numeric_ids) {
+ if ((preserve_gid || preserve_acls) && !numeric_ids) {
/* read the gid list */
while ((id = read_int(f)) != 0)
recv_group_name(f, (gid_t)id);
}
+#ifdef SUPPORT_ACLS
+ if (preserve_acls && !numeric_ids) {
+ id_t *id;
+ while ((id = next_acl_uid(flist)) != NULL)
+ *id = match_uid(*id);
+ while ((id = next_acl_gid(flist)) != NULL)
+ *id = match_gid(*id);
+ }
+#endif
+
/* 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]));
}
}