Matt McCutchen's Web Site
/
rsync
/
rsync.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use variables to hold the constant itemized strings so
[rsync/rsync.git]
/
uidlist.c
diff --git
a/uidlist.c
b/uidlist.c
index
93fc10e
..
a606065
100644
(file)
--- a/
uidlist.c
+++ b/
uidlist.c
@@
-6,8
+6,9
@@
* Copyright (C) 2004-2007 Wayne Davison
*
* This program is free software; you can redistribute it and/or modify
* 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 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
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
@@
-15,8
+16,7
@@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License along
* 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
*/
/* If the source username/group does not exist on the target then use
@@
-26,12
+26,6
@@
#include "rsync.h"
#include "io.h"
#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 verbose;
extern int am_root;
extern int preserve_uid;
@@
-39,9
+33,17
@@
extern int preserve_gid;
extern int preserve_acls;
extern int numeric_ids;
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;
struct idlist {
struct idlist *next;
- char *name;
+ c
onst c
har *name;
id_t id, id2;
uint16 flags;
};
id_t id, id2;
uint16 flags;
};
@@
-49,7
+51,7
@@
struct idlist {
static struct idlist *uidlist;
static struct idlist *gidlist;
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, c
onst c
har *name,
id_t id2, uint16 flags)
{
struct idlist *node = new(struct idlist);
id_t id2, uint16 flags)
{
struct idlist *node = new(struct idlist);
@@
-65,7
+67,7
@@
static struct idlist *add_to_list(struct idlist **root, id_t id, char *name,
}
/* turn a uid into a user name */
}
/* turn a uid into a user name */
-static char *uid_to_name(uid_t uid)
+static c
onst c
har *uid_to_name(uid_t uid)
{
struct passwd *pass = getpwuid(uid);
if (pass)
{
struct passwd *pass = getpwuid(uid);
if (pass)
@@
-74,7
+76,7
@@
static char *uid_to_name(uid_t uid)
}
/* turn a gid into a group name */
}
/* turn a gid into a group name */
-static char *gid_to_name(gid_t gid)
+static c
onst c
har *gid_to_name(gid_t gid)
{
struct group *grp = getgrgid(gid);
if (grp)
{
struct group *grp = getgrgid(gid);
if (grp)
@@
-82,7
+84,7
@@
static char *gid_to_name(gid_t gid)
return NULL;
}
return NULL;
}
-static uid_t map_uid(uid_t id, char *name)
+static uid_t map_uid(uid_t id, c
onst c
har *name)
{
uid_t uid;
if (id != 0 && name_to_uid(name, &uid))
{
uid_t uid;
if (id != 0 && name_to_uid(name, &uid))
@@
-90,7
+92,7
@@
static uid_t map_uid(uid_t id, char *name)
return id;
}
return id;
}
-static gid_t map_gid(gid_t id, char *name)
+static gid_t map_gid(gid_t id, c
onst c
har *name)
{
gid_t gid;
if (id != 0 && name_to_gid(name, &gid))
{
gid_t gid;
if (id != 0 && name_to_gid(name, &gid))
@@
-158,7
+160,7
@@
static int is_in_group(gid_t gid)
}
/* Add a uid to the list of uids. Only called on receiving side. */
}
/* 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, c
onst c
har *name)
{
uid_t id2 = name ? map_uid(id, name) : id;
struct idlist *node;
{
uid_t id2 = name ? map_uid(id, name) : id;
struct idlist *node;
@@
-174,7
+176,7
@@
static struct idlist *recv_add_uid(uid_t id, char *name)
}
/* Add a gid to the list of gids. Only called on receiving side. */
}
/* 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, c
onst c
har *name)
{
gid_t id2 = name ? map_gid(id, name) : id;
struct idlist *node;
{
gid_t id2 = name ? map_gid(id, name) : id;
struct idlist *node;
@@
-214,32
+216,28
@@
uid_t match_uid(uid_t uid)
gid_t match_gid(gid_t gid, uint16 *flags_ptr)
{
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;
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;
if (flags_ptr && list->flags & FLAG_SKIP_GROUP)
*flags_ptr |= FLAG_SKIP_GROUP;
- return l
ast_out = l
ist->id2;
+ return list->id2;
}
/* Add a uid to the list of uids. Only called on sending side. */
}
/* Add a uid to the list of uids. Only called on sending side. */
-char *add_uid(uid_t uid)
+c
onst c
har *add_uid(uid_t uid)
{
struct idlist *list;
struct idlist *node;
{
struct idlist *list;
struct idlist *node;
@@
-257,7
+255,7
@@
char *add_uid(uid_t uid)
}
/* Add a gid to the list of gids. Only called on sending side. */
}
/* Add a gid to the list of gids. Only called on sending side. */
-char *add_gid(gid_t gid)
+c
onst c
har *add_gid(gid_t gid)
{
struct idlist *list;
struct idlist *node;
{
struct idlist *list;
struct idlist *node;
@@
-318,6
+316,10
@@
uid_t recv_user_name(int f, uid_t uid)
if (!name)
out_of_memory("recv_user_name");
read_sbuf(f, name, len);
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;
}
node = recv_add_uid(uid, name); /* node keeps name's memory */
return node->id2;
}
@@
-330,6
+332,10
@@
gid_t recv_group_name(int f, gid_t gid, uint16 *flags_ptr)
if (!name)
out_of_memory("recv_group_name");
read_sbuf(f, name, len);
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;
node = recv_add_gid(gid, name); /* node keeps name's memory */
if (flags_ptr && node->flags & FLAG_SKIP_GROUP)
*flags_ptr |= FLAG_SKIP_GROUP;
@@
-343,13
+349,13
@@
void recv_id_list(int f, struct file_list *flist)
id_t id;
int i;
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);
}
/* 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);
/* read the gid list */
while ((id = read_varint30(f)) != 0)
recv_group_name(f, id, NULL);
@@
-361,11
+367,11
@@
void recv_id_list(int f, struct file_list *flist)
match_acl_ids();
#endif
if (am_root && preserve_uid && !numeric_ids) {
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)) {
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);
}
F_GROUP(flist->files[i]) = match_gid(F_GROUP(flist->files[i]),
&flist->files[i]->flags);
}