/* -*-c-*-
*
- * $Id: userdb.c,v 1.4 1997/08/20 16:24:58 mdw Exp $
+ * $Id: userdb.c,v 1.5 1997/09/17 10:24:08 mdw Exp $
*
* User database management
*
/*----- Revision history --------------------------------------------------*
*
* $Log: userdb.c,v $
- * Revision 1.4 1997/08/20 16:24:58 mdw
+ * Revision 1.5 1997/09/17 10:24:08 mdw
+ * Use `uid_t' instead of `int' for uids and gids. Not quite sure why I
+ * didn't do this before.
+ *
+ * Revision 1.4 1997/08/20 16:24:58 mdw
* Patch memory leak. Rename `userdb_reinit' to `userdb_end' for more
* sensible restart.
*
*
* Arguments: @userdb__map *m@ = pointer to the map block
* @const char *name@ = pointer to the item's name
- * @int id@ = the item's id number
+ * @uid_t id@ = the item's id number
* @void *rec@ = pointer to the actual record
*
* Returns: ---
static void userdb__addToMap(userdb__map *m,
const char *name,
- int id, void *rec)
+ uid_t id, void *rec)
{
unsigned f;
userdb__sym *s;
/* --- @userdb__byId@ --- *
*
* Arguments: @userdb__map *m@ = pointer to a map block
- * @int id@ = id number to find
+ * @uid_t id@ = id number to find
*
* Returns: A pointer to the appropriate block, or zero if not found.
*
* Use: Looks up an ID in a mapping, and returns the result.
*/
-static void *userdb__byId(userdb__map *m, int id)
+static void *userdb__byId(userdb__map *m, uid_t id)
{
userdb__sym *s = sym_find(&m->idmap, (char *)&id, sizeof(id), 0, 0);
return (s ? s->rec : 0);
s = strtok(s, ":"); if (!s) goto tidy_0; pw->pw_name = xstrdup(s);
s = strtok(0, ":"); if (!s) goto tidy_1; pw->pw_passwd = xstrdup(s);
- s = strtok(0, ":"); if (!s) goto tidy_2; pw->pw_uid = atoi(s);
- s = strtok(0, ":"); if (!s) goto tidy_2; pw->pw_gid = atoi(s);
+ s = strtok(0, ":"); if (!s) goto tidy_2; pw->pw_uid = (uid_t)atol(s);
+ s = strtok(0, ":"); if (!s) goto tidy_2; pw->pw_gid = (gid_t)atol(s);
s = strtok(0, ":"); if (!s) goto tidy_2; pw->pw_gecos = xstrdup(s);
s = strtok(0, ":"); if (!s) goto tidy_3; pw->pw_dir = xstrdup(s);
s = strtok(0, ":"); if (!s) goto tidy_4; pw->pw_shell = xstrdup(s);
s = strtok(s, ":"); if (!s) goto tidy_0; gr->gr_name = xstrdup(s);
s = strtok(0, ":"); if (!s) goto tidy_1; gr->gr_passwd = xstrdup(s);
- s = strtok(0, ":"); if (!s) goto tidy_2; gr->gr_gid = atoi(s);
+ s = strtok(0, ":"); if (!s) goto tidy_2; gr->gr_gid = (gid_t)atol(s);
/* --- Find the start of the member list --- */