to {user,group}_to_*(). Based on a patch by Matt McCutchen.
static int add_a_group(int f_out, const char *gname)
{
gid_t gid;
static int add_a_group(int f_out, const char *gname)
{
gid_t gid;
- if (!name_to_gid(gname, &gid)) {
- if (!isDigit(gname)) {
- rprintf(FLOG, "Invalid gid %s\n", gname);
- io_printf(f_out, "@ERROR: invalid gid %s\n", gname);
- return -1;
- }
- gid = atol(gname);
+ if (!group_to_gid(gname, &gid, True)) {
+ rprintf(FLOG, "Invalid gid %s\n", gname);
+ io_printf(f_out, "@ERROR: invalid gid %s\n", gname);
+ return -1;
}
if (gid_count == MAX_GID_LIST) {
rprintf(FLOG, "Too many groups specified via gid parameter.\n");
}
if (gid_count == MAX_GID_LIST) {
rprintf(FLOG, "Too many groups specified via gid parameter.\n");
p = *lp_uid(i) ? lp_uid(i) : am_root ? NOBODY_USER : NULL;
if (p) {
p = *lp_uid(i) ? lp_uid(i) : am_root ? NOBODY_USER : NULL;
if (p) {
- if (!name_to_uid(p, &uid)) {
- if (!isDigit(p)) {
- rprintf(FLOG, "Invalid uid %s\n", p);
- io_printf(f_out, "@ERROR: invalid uid %s\n", p);
- return -1;
- }
- uid = atol(p);
+ if (!user_to_uid(p, &uid, True)) {
+ rprintf(FLOG, "Invalid uid %s\n", p);
+ io_printf(f_out, "@ERROR: invalid uid %s\n", p);
+ return -1;
else if (*name && id) {
if (idlist_ptr == &uidlist) {
uid_t uid;
else if (*name && id) {
if (idlist_ptr == &uidlist) {
uid_t uid;
- id2 = name_to_uid(name, &uid) ? uid : id;
+ id2 = user_to_uid(name, &uid, False) ? uid : id;
- id2 = name_to_gid(name, &gid) ? gid : id;
+ id2 = group_to_gid(name, &gid, False) ? gid : id;
char *dash = strchr(cp, '-');
if (strspn(cp, "0123456789-") != (size_t)(colon - cp)
|| (dash && (!dash[1] || strchr(dash+1, '-')))) {
char *dash = strchr(cp, '-');
if (strspn(cp, "0123456789-") != (size_t)(colon - cp)
|| (dash && (!dash[1] || strchr(dash+1, '-')))) {
rprintf(FERROR, "Invalid number in --%smap: %s\n",
usernames ? "user" : "group", cp);
exit_cleanup(RERR_SYNTAX);
rprintf(FERROR, "Invalid number in --%smap: %s\n",
usernames ? "user" : "group", cp);
exit_cleanup(RERR_SYNTAX);
- 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 (name_to_uid(colon+1, &uid))
+ if (user_to_uid(colon+1, &uid, True))
add_to_list(idmap_ptr, id1, name, uid, flags);
else {
rprintf(FERROR,
add_to_list(idmap_ptr, id1, name, uid, flags);
else {
rprintf(FERROR,
- if (name_to_gid(colon+1, &gid))
+ if (group_to_gid(colon+1, &gid, True))
add_to_list(idmap_ptr, id1, name, gid, flags);
else {
rprintf(FERROR,
add_to_list(idmap_ptr, id1, name, gid, flags);
else {
rprintf(FERROR,
-/** Turn a user name into a uid */
-int name_to_uid(const char *name, uid_t *uid_p)
+/* Parse a user name or (optionally) a number into a uid */
+int user_to_uid(const char *name, uid_t *uid_p, BOOL num_ok)
{
struct passwd *pass;
if (!name || !*name)
return 0;
{
struct passwd *pass;
if (!name || !*name)
return 0;
+ if (num_ok && name[strspn(name, "0123456789")] == '\0') {
+ *uid_p = atol(name);
+ return 1;
+ }
if (!(pass = getpwnam(name)))
return 0;
*uid_p = pass->pw_uid;
return 1;
}
if (!(pass = getpwnam(name)))
return 0;
*uid_p = pass->pw_uid;
return 1;
}
-/** Turn a group name into a gid */
-int name_to_gid(const char *name, gid_t *gid_p)
+/* Parse a group name or (optionally) a number into a gid */
+int group_to_gid(const char *name, gid_t *gid_p, BOOL num_ok)
{
struct group *grp;
if (!name || !*name)
return 0;
{
struct group *grp;
if (!name || !*name)
return 0;
+ if (num_ok && name[strspn(name, "0123456789")] == '\0') {
+ *gid_p = atol(name);
+ return 1;
+ }
if (!(grp = getgrnam(name)))
return 0;
*gid_p = grp->gr_gid;
if (!(grp = getgrnam(name)))
return 0;
*gid_p = grp->gr_gid;