*
* 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;
} else {
} 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);
}