From e893b83f61ed48e0014b6525d5f55d15e7f4cd77 Mon Sep 17 00:00:00 2001 From: mdw Date: Thu, 7 Aug 1997 09:44:29 +0000 Subject: [PATCH] Read NIS-based passwords from the YP server directly, rather than using `popen(ypcat)', which is probably both slower and less secure. --- src/userdb.c | 81 ++++++++++++++++++++++++++++++------------------------------ 1 file changed, 40 insertions(+), 41 deletions(-) diff --git a/src/userdb.c b/src/userdb.c index 77e1a3d..a03dc89 100644 --- a/src/userdb.c +++ b/src/userdb.c @@ -1,6 +1,6 @@ /* -*-c-*- * - * $Id: userdb.c,v 1.2 1997/08/04 10:24:26 mdw Exp $ + * $Id: userdb.c,v 1.3 1997/08/07 09:44:29 mdw Exp $ * * User database management * @@ -29,6 +29,10 @@ /*----- Revision history --------------------------------------------------* * * $Log: userdb.c,v $ + * 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. + * * Revision 1.2 1997/08/04 10:24:26 mdw * Sources placed under CVS control. * @@ -54,6 +58,7 @@ #include #ifdef HAVE_YP +# include # include # include #endif @@ -64,6 +69,7 @@ /* --- Local headers --- */ +#include "become.h" #include "sym.h" #include "userdb.h" #include "utils.h" @@ -213,33 +219,24 @@ static void userdb__clearMap(userdb__map *m, void (*freerec)(void *rec)) /* --- @userdb__dumpUser@ --- * * * Arguments: @const struct passwd *pw@ = pointer to a user block - * @FILE *fp@ = pointer to stream to write on * * Returns: --- * * Use: Writes a user's informationt to a stream. */ -#ifndef NDEBUG +#ifdef TRACING -static void userdb__dumpUser(const struct passwd *pw, FILE *fp) +static void userdb__dumpUser(const struct passwd *pw) { - printf("\n" - "*** name == %s\n" - "*** passwd == %s\n" - "*** uid == %i\n" - "*** gid == %i\n" - "*** gecos == %s\n" - "*** home == %s\n" - "*** shell == %s\n", - pw->pw_name, pw->pw_passwd, (int)pw->pw_uid, (int)pw->pw_gid, - pw->pw_gecos, pw->pw_dir, pw->pw_shell); + trace(TRACE_DEBUG, + "debug: name `%s' passwd `%s' uid %i gid %i", + pw->pw_name, pw->pw_passwd, (int)pw->pw_uid, (int)pw->pw_gid); + trace(TRACE_DEBUG, + "debug: ... gecos `%s' home `%s' shell `%s'", + pw->pw_gecos, pw->pw_dir, pw->pw_shell); } -#else - -#define userdb__dumpUser(pw, fp) ((void)0) - #endif /* --- @userdb_copyUser@ --- * @@ -348,26 +345,19 @@ void userdb_freeUser(void *rec) * Use: Writes a group's information to a stream. */ -#ifndef NDEBUG +#ifdef TRACING -static void userdb__dumpGroup(const struct group *gr, FILE *fp) +static void userdb__dumpGroup(const struct group *gr) { char *const *p; - printf("\n" - "*** name == %s\n" - "*** passwd == %s\n" - "*** gid == %i\n" - "*** members...\n", + trace(TRACE_DEBUG, + "debug: name `%s' passwd `%s' gid %i", gr->gr_name, gr->gr_passwd, (int)gr->gr_gid); for (p = gr->gr_mem; *p; p++) - printf("*** %s\n", *p); + trace(TRACE_DEBUG,"debug: ... `%s'", *p); } -#else - -#define userdb__dumpUser(pw, fp) ((void)0) - #endif /* --- @userdb_copyGroup@ --- * @@ -624,9 +614,12 @@ static int userdb__foreachUser(int st, char *k, int ksz, cv = xmalloc(vsz + 1); memcpy(cv, v, vsz); cv[vsz] = 0; + T( trace(TRACE_DEBUG, "debug: nis string: `%s'", cv); ) pw = userdb__buildUser(cv); - if (pw && !userdb__byName(&userdb__users, pw->pw_name)) + 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); + } free(cv); return (0); } @@ -656,9 +649,12 @@ static int userdb__foreachGroup(int st, char *k, int ksz, cv = xmalloc(vsz + 1); memcpy(cv, v, vsz); cv[vsz] = 0; + T( trace(TRACE_DEBUG, "debug: nis string: `%s'", cv); ) gr = userdb__buildGroup(cv); - if (gr && !userdb__byName(&userdb__groups, gr->gr_name)) + 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); + } free(cv); return (0); } @@ -682,6 +678,8 @@ void userdb_yp(void) yp_bind(ypdom)) return; + T( trace(TRACE_DEBUG, "debug: adding NIS users"); ) + /* --- Fetch the users map --- */ { @@ -697,7 +695,6 @@ void userdb_yp(void) } yp_unbind(ypdom); - free(ypdom); } #else @@ -719,7 +716,7 @@ void userdb_yp(void) { ; } void userdb_local(void) { - D( printf("adding local users...\n"); ) + T( trace(TRACE_DEBUG, "debug: adding local users"); ) /* --- Fetch users first --- */ @@ -728,7 +725,7 @@ void userdb_local(void) setpwent(); while ((pw = getpwent()) != 0) { - D( userdb__dumpUser(pw, stdout); ) + IF_TRACING(TRACE_DEBUG, userdb__dumpUser(pw); ) if (!userdb__byName(&userdb__users, pw->pw_name)) userdb__addToMap(&userdb__users, pw->pw_name, pw->pw_uid, userdb_copyUser(pw)); @@ -743,7 +740,7 @@ void userdb_local(void) setgrent(); while ((gr = getgrent()) != 0) { - D( userdb__dumpGroup(gr, stdout); ) + IF_TRACING(TRACE_DEBUG, userdb__dumpGroup(gr); ) if (!userdb__byName(&userdb__groups, gr->gr_name)) userdb__addToMap(&userdb__groups, gr->gr_name, gr->gr_gid, userdb_copyGroup(gr)); @@ -789,29 +786,31 @@ void userdb_reinit(void) void dumpit(const char *msg) { - printf("\n\n$$$ %s\n", msg); + trace(TRACE_DEBUG, "debug: %s", msg); { struct passwd *pw; for (userdb_iterateUsers(); (pw = userdb_nextUser()) != 0; ) - userdb__dumpUser(pw, stdout); + userdb__dumpUser(pw); } { struct group *gr; for (userdb_iterateGroups(); (gr = userdb_nextGroup()) != 0; ) - userdb__dumpGroup(gr, stdout); + userdb__dumpGroup(gr); } } int main(void) { + ego("userdb-test"); + traceon(stderr, TRACE_ALL); userdb_init(); dumpit("cleared"); - userdb_local(); - dumpit("local"); userdb_yp(); dumpit("yp"); + userdb_local(); + dumpit("local"); return (0); } -- 2.11.0