*
* Copyright (C) 1996 Andrew Tridgell
* Copyright (C) 1996 Paul Mackerras
- * Copyright (C) 2004-2008 Wayne Davison
+ * Copyright (C) 2004-2009 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
if (node)
id2 = node->id2;
else if (*name && id) {
- if (idmap == uidmap) {
+ if (idlist_ptr == &uidlist) {
uid_t uid;
- id2 = name_to_uid(name, &uid) ? uid : id;
+ id2 = name_to_uid(name, &uid, False) ? uid : id;
} else {
gid_t gid;
- id2 = name_to_gid(name, &gid) ? gid : id;
+ id2 = name_to_gid(name, &gid, False) ? gid : id;
}
} else
id2 = id;
- flag = idmap == gidmap && !am_root && !is_in_group(id2) ? FLAG_SKIP_GROUP : 0;
+ flag = idlist_ptr == &gidlist && !am_root && !is_in_group(id2) ? FLAG_SKIP_GROUP : 0;
node = add_to_list(idlist_ptr, id, *name ? name : NULL, id2, flag);
if (DEBUG_GTE(OWN, 2)) {
rprintf(FINFO, "%sid %u(%s) maps to %u\n",
- idmap == uidmap ? "u" : "g",
+ idlist_ptr == &uidlist ? "u" : "g",
(unsigned)id, name, (unsigned)id2);
}
char *dash = strchr(cp, '-');
if (strspn(cp, "0123456789-") != (size_t)(colon - cp)
|| (dash && (!dash[1] || strchr(dash+1, '-')))) {
- bad_number:
rprintf(FERROR, "Invalid number in --%smap: %s\n",
usernames ? "user" : "group", cp);
exit_cleanup(RERR_SYNTAX);
id1 = 0;
}
- if (isDigit(colon+1)) {
- if (strspn(colon+1, "0123456789") != (size_t)(end - colon - 1)) {
- cp = colon+1;
- goto bad_number;
- }
- add_to_list(idmap_ptr, id1, name, atol(colon+1), flags);
- } else if (usernames) {
+ if (usernames) {
uid_t uid;
- if (name_to_uid(colon+1, &uid))
+ if (name_to_uid(colon+1, &uid, True))
add_to_list(idmap_ptr, id1, name, uid, flags);
else {
rprintf(FERROR,
}
} else {
gid_t gid;
- if (name_to_gid(colon+1, &gid))
+ if (name_to_gid(colon+1, &gid, True))
add_to_list(idmap_ptr, id1, name, gid, flags);
else {
rprintf(FERROR,