Use `uid_t' instead of `int' for uids and gids. Not quite sure why I

[become] / src / userdb.c

diff --git a/src/userdb.c b/src/userdb.c
index a03dc89..eb963d0 100644 (file)
--- a/src/userdb.c
+++ b/src/userdb.c
@@ -1,6 +1,6 @@
 /* -*-c-*-
  *
- * $Id: userdb.c,v 1.3 1997/08/07 09:44:29 mdw Exp $
+ * $Id: userdb.c,v 1.5 1997/09/17 10:24:08 mdw Exp $
  *
  * User database management
  *
@@ -29,6 +29,14 @@
 /*----- Revision history --------------------------------------------------*
  *
  * $Log: userdb.c,v $
+ * 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.
+ *
  * Revision 1.3  1997/08/07 09:44:29  mdw
  * Read NIS-based passwords from the YP server directly, rather than using
  * `popen(ypcat)', which is probably both slower and less secure.
@@ -127,7 +135,7 @@ static void userdb__createMap(userdb__map *m)
  *
  * 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:    ---
@@ -137,7 +145,7 @@ static void userdb__createMap(userdb__map *m)
 
 static void userdb__addToMap(userdb__map *m,
                             const char *name,
-                            int id, void *rec)
+                            uid_t id, void *rec)
 {
   unsigned f;
   userdb__sym *s;
@@ -176,14 +184,14 @@ static void *userdb__byName(userdb__map *m, const char *name)
 /* --- @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);
@@ -287,8 +295,8 @@ static struct passwd *userdb__buildUser(char *s)
 
   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);
@@ -415,7 +423,7 @@ static struct group *userdb__buildGroup(char *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 --- */
 
@@ -619,7 +627,8 @@ static int userdb__foreachUser(int st, char *k, int ksz,
   if (pw && !userdb__byName(&userdb__users, pw->pw_name)) {
     IF_TRACING(TRACE_DEBUG, userdb__dumpUser(pw); )
     userdb__addToMap(&userdb__users, pw->pw_name, pw->pw_uid, pw);
-  }
+  } else
+    userdb_freeUser(pw);
   free(cv);
   return (0);
 }
@@ -654,7 +663,8 @@ static int userdb__foreachGroup(int st, char *k, int ksz,
   if (gr && !userdb__byName(&userdb__groups, gr->gr_name)) {
     IF_TRACING(TRACE_DEBUG, userdb__dumpGroup(gr); )
     userdb__addToMap(&userdb__groups, gr->gr_name, gr->gr_gid, gr);
-  }
+  } else
+    userdb_freeGroup(gr);
   free(cv);
   return (0);
 }
@@ -764,20 +774,19 @@ void userdb_init(void)
   userdb__createMap(&userdb__groups);
 }
 
-/* --- @userdb_reinit@ --- *
+/* --- @userdb_end@ --- *
  *
  * Arguments:  ---
  *
  * Returns:    ---
  *
- * Use:                Reinitialises the user database.
+ * Use:                Closes down the user database.
  */
 
-void userdb_reinit(void)
+void userdb_end(void)
 {
   userdb__clearMap(&userdb__users, userdb_freeUser);
   userdb__clearMap(&userdb__groups, userdb_freeGroup);
-  userdb_init();
 }
 
 /*----- Test rig ----------------------------------------------------------*/
@@ -804,13 +813,22 @@ void dumpit(const char *msg)
 int main(void)
 {
   ego("userdb-test");
-  traceon(stderr, TRACE_ALL);
+/*   traceon(stdout, TRACE_ALL); */
   userdb_init();
-  dumpit("cleared");
-  userdb_yp();
-  dumpit("yp");
   userdb_local();
-  dumpit("local");
+  userdb_yp();
+  printf("loaded (%lu)\n", track_memused());
+  getchar();
+  for (;;) {
+    userdb_end();
+    printf("cleared (%lu)\n", track_memused());
+/*    track_memlist(); */
+    userdb_init();
+    userdb_local();
+    userdb_yp();
+    printf("reloaded (%lu)\n", track_memused());
+    getchar();
+  }
   return (0);
 }