*
* Copyright (C) 1996 Andrew Tridgell
* Copyright (C) 1996 Paul Mackerras
- * Copyright (C) 2004-2007 Wayne Davison
+ * Copyright (C) 2004-2008 Wayne Davison
*
* This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
+ * with this program; if not, visit the http://fsf.org website.
*/
/* If the source username/group does not exist on the target then use
#include "rsync.h"
#include "io.h"
-#ifdef HAVE_GETGROUPS
-# ifndef GETGROUPS_T
-# define GETGROUPS_T gid_t
-# endif
-#endif
-
extern int verbose;
extern int am_root;
extern int preserve_uid;
extern int preserve_acls;
extern int numeric_ids;
+#ifdef HAVE_GETGROUPS
+# ifndef GETGROUPS_T
+# define GETGROUPS_T gid_t
+# endif
+#endif
+
+#define GID_NONE ((gid_t)-1)
+
struct idlist {
struct idlist *next;
- char *name;
+ const char *name;
id_t id, id2;
uint16 flags;
};
static struct idlist *uidlist;
static struct idlist *gidlist;
-static struct idlist *add_to_list(struct idlist **root, id_t id, char *name,
+static struct idlist *add_to_list(struct idlist **root, id_t id, const char *name,
id_t id2, uint16 flags)
{
struct idlist *node = new(struct idlist);
}
/* turn a uid into a user name */
-static char *uid_to_name(uid_t uid)
+static const char *uid_to_name(uid_t uid)
{
struct passwd *pass = getpwuid(uid);
if (pass)
}
/* turn a gid into a group name */
-static char *gid_to_name(gid_t gid)
+static const char *gid_to_name(gid_t gid)
{
struct group *grp = getgrgid(gid);
if (grp)
return NULL;
}
-static uid_t map_uid(uid_t id, char *name)
+static uid_t map_uid(uid_t id, const char *name)
{
uid_t uid;
if (id != 0 && name_to_uid(name, &uid))
return id;
}
-static gid_t map_gid(gid_t id, char *name)
+static gid_t map_gid(gid_t id, const char *name)
{
gid_t gid;
if (id != 0 && name_to_gid(name, &gid))
}
/* Add a uid to the list of uids. Only called on receiving side. */
-static struct idlist *recv_add_uid(uid_t id, char *name)
+static struct idlist *recv_add_uid(uid_t id, const char *name)
{
uid_t id2 = name ? map_uid(id, name) : id;
struct idlist *node;
}
/* Add a gid to the list of gids. Only called on receiving side. */
-static struct idlist *recv_add_gid(gid_t id, char *name)
+static struct idlist *recv_add_gid(gid_t id, const char *name)
{
gid_t id2 = name ? map_gid(id, name) : id;
struct idlist *node;
gid_t match_gid(gid_t gid, uint16 *flags_ptr)
{
- static gid_t last_in = GID_NONE, last_out = GID_NONE;
+ static struct idlist *last = NULL;
struct idlist *list;
- if (gid == GID_NONE)
- return GID_NONE;
-
- if (gid == last_in)
- return last_out;
-
- last_in = gid;
-
- for (list = gidlist; list; list = list->next) {
- if (list->id == gid)
- break;
+ if (last && gid == last->id)
+ list = last;
+ else {
+ for (list = gidlist; list; list = list->next) {
+ if (list->id == gid)
+ break;
+ }
+ if (!list)
+ list = recv_add_gid(gid, NULL);
+ last = list;
}
- if (!list)
- list = recv_add_gid(gid, NULL);
-
if (flags_ptr && list->flags & FLAG_SKIP_GROUP)
*flags_ptr |= FLAG_SKIP_GROUP;
- return last_out = list->id2;
+ return list->id2;
}
/* Add a uid to the list of uids. Only called on sending side. */
-char *add_uid(uid_t uid)
+const char *add_uid(uid_t uid)
{
struct idlist *list;
struct idlist *node;
}
/* Add a gid to the list of gids. Only called on sending side. */
-char *add_gid(gid_t gid)
+const char *add_gid(gid_t gid)
{
struct idlist *list;
struct idlist *node;
if (!name)
out_of_memory("recv_user_name");
read_sbuf(f, name, len);
+ if (numeric_ids < 0) {
+ free(name);
+ name = NULL;
+ }
node = recv_add_uid(uid, name); /* node keeps name's memory */
return node->id2;
}
if (!name)
out_of_memory("recv_group_name");
read_sbuf(f, name, len);
+ if (numeric_ids < 0) {
+ free(name);
+ name = NULL;
+ }
node = recv_add_gid(gid, name); /* node keeps name's memory */
if (flags_ptr && node->flags & FLAG_SKIP_GROUP)
*flags_ptr |= FLAG_SKIP_GROUP;
id_t id;
int i;
- if ((preserve_uid || preserve_acls) && !numeric_ids) {
+ if ((preserve_uid || preserve_acls) && numeric_ids <= 0) {
/* read the uid list */
while ((id = read_varint30(f)) != 0)
recv_user_name(f, id);
}
- if ((preserve_gid || preserve_acls) && !numeric_ids) {
+ if ((preserve_gid || preserve_acls) && numeric_ids <= 0) {
/* read the gid list */
while ((id = read_varint30(f)) != 0)
recv_group_name(f, id, NULL);
match_acl_ids();
#endif
if (am_root && preserve_uid && !numeric_ids) {
- for (i = 0; i < flist->count; i++)
+ for (i = 0; i < flist->used; i++)
F_OWNER(flist->files[i]) = match_uid(F_OWNER(flist->files[i]));
}
if (preserve_gid && (!am_root || !numeric_ids)) {
- for (i = 0; i < flist->count; i++) {
+ for (i = 0; i < flist->used; i++) {
F_GROUP(flist->files[i]) = match_gid(F_GROUP(flist->files[i]),
&flist->files[i]->flags);
}
Matt McCutchen's Web Site / rsync / rsync.git / blobdiff