X-Git-Url: https://git.distorted.org.uk/~mdw/become/blobdiff_plain/afce951bf49ff63b726810860a29ebeec534146c..4c37c6af624a9d4dabadac32a5e566d388ee78d7:/src/netg.c diff --git a/src/netg.c b/src/netg.c index 87afce0..0202ebc 100644 --- a/src/netg.c +++ b/src/netg.c @@ -1,10 +1,10 @@ /* -*-c-*- * - * $Id: netg.c,v 1.1 1997/08/07 09:45:00 mdw Exp $ + * $Id: netg.c,v 1.6 2003/10/12 00:39:16 mdw Exp $ * * A local database of netgroups * - * (c) 1997 EBI + * (c) 1998 EBI */ /*----- Licensing notice --------------------------------------------------* @@ -29,6 +29,23 @@ /*----- Revision history --------------------------------------------------* * * $Log: netg.c,v $ + * Revision 1.6 2003/10/12 00:39:16 mdw + * Light fixes for strange building. + * + * Revision 1.5 2003/10/12 00:14:55 mdw + * Major overhaul. Now uses DSA signatures rather than the bogus symmetric + * encrypt-and-hope thing. Integrated with mLib and Catacomb. + * + * Revision 1.4 1998/04/23 13:24:49 mdw + * Switch to using the ypstuff interface to YP server. + * + * Revision 1.3 1998/01/12 16:46:17 mdw + * Fix copyright date. + * + * Revision 1.2 1997/08/20 16:19:11 mdw + * Patch memory leak. Replace `name_reinit' by `name_end' for more sensible + * restart. Don't try to trace when tracing's turned off. + * * Revision 1.1 1997/08/07 09:45:00 mdw * New source file added to maintain a netgroups database. * @@ -49,12 +66,6 @@ #include -#ifdef HAVE_YP -# include -# include -# include -#endif - #include #include @@ -63,14 +74,20 @@ #include #include +/* --- mLib headers --- */ + +#include +#include +#include +#include + /* --- Local headers --- */ #include "become.h" #include "config.h" #include "netg.h" -#include "sym.h" #include "userdb.h" -#include "utils.h" +#include "ypstuff.h" /*----- Type definitions --------------------------------------------------*/ @@ -338,6 +355,8 @@ static int netg__foreach(int st, char *k, int ksz, goto duff_restart; } + free(c->car.atom); + free(c); free(kc); free(vc); return (0); @@ -353,7 +372,7 @@ static int netg__foreach(int st, char *k, int ksz, * Use: Dumps the netgroup given. */ -#ifdef TRACING +#ifndef NTRACE static void netg__dumpGroup(netg__cons *c, int lev) { @@ -402,21 +421,23 @@ static void netg__dumpGroup(netg__cons *c, int lev) * Use: Dumps the netgroups table. */ +#ifndef NTRACE + static void netg__dump(void) { sym_iter i; netg__sym *sng; -#ifdef TRACING trace(TRACE_DEBUG, "debug: dumping netgroups file"); - for (sym_createIter(&i, &netg__table); (sng = sym_next(&i)) != 0; ) { + for (sym_mkiter(&i, &netg__table); (sng = sym_next(&i)) != 0; ) { trace(TRACE_DEBUG, "debug: netgroup `%s'...", sng->_base.name); sng->cons->f &= ~f_visit; netg__dumpGroup(sng->cons, 1); } -#endif } +#endif + /* --- @netg_iterate@, @netg_iterate_r@ --- * * * Arguments: @netg_iter *i@ = pointer to a netgroup iterator object @@ -427,7 +448,7 @@ static void netg__dump(void) */ void netg_iterate(void) { netg_iterate_r(&netg__iter); } -void netg_iterate_r(netg_iter *i) { sym_createIter(i, &netg__table); } +void netg_iterate_r(netg_iter *i) { sym_mkiter(i, &netg__table); } /* --- @netg_next@, @netg_next_r@ --- * * @@ -546,29 +567,23 @@ static void netg__breakCycle(netg__cons *c) void netg_init(void) { - char *ypdom; - /* --- Initialise my symbol table --- */ - sym_createTable(&netg__table); + sym_create(&netg__table); /* --- Bind myself unto a YP server --- */ - if (yp_get_default_domain(&ypdom) || - yp_bind(ypdom)) + ypstuff_bind(); + if (!yp_domain) return; /* --- Now try to read all the netgroup entries --- */ { static struct ypall_callback ncb = { netg__foreach, 0 }; - yp_all(ypdom, "netgroup", &ncb); + yp_all(yp_domain, "netgroup", &ncb); } - /* --- Unbind from the server --- */ - - yp_unbind(ypdom); - /* --- Dump the table --- */ IF_TRACING(TRACE_DEBUG, netg__dump(); ) @@ -581,7 +596,7 @@ void netg_init(void) netg__cons *c; netg__atom *a; - for (sym_createIter(&i, &netg__table); (sng = sym_next(&i)) != 0; ) { + for (sym_mkiter(&i, &netg__table); (sng = sym_next(&i)) != 0; ) { for (c = sng->cons; c; c = c->cdr) { if ((c->f & f_cons) == 0 && c->car.atom->n) { a = c->car.atom; @@ -606,9 +621,9 @@ void netg_init(void) sym_iter i; netg__sym *sng; - for (sym_createIter(&i, &netg__table); (sng = sym_next(&i)) != 0; ) + for (sym_mkiter(&i, &netg__table); (sng = sym_next(&i)) != 0; ) sng->cons->f &= ~f_uncycled; - for (sym_createIter(&i, &netg__table); (sng = sym_next(&i)) != 0; ) + for (sym_mkiter(&i, &netg__table); (sng = sym_next(&i)) != 0; ) netg__breakCycle(sng->cons); } @@ -617,16 +632,16 @@ void netg_init(void) IF_TRACING(TRACE_DEBUG, netg__dump(); ) } -/* --- @netg_reinit@ --- * +/* --- @netg_end@ --- * * * Arguments: --- * * Returns: --- * - * Use: Forces a re-read of the netgroups file. + * Use: Empties the netgroups database. */ -void netg_reinit(void) +void netg_end(void) { sym_iter i; netg__sym *sng; @@ -634,7 +649,7 @@ void netg_reinit(void) /* --- Remove all the old netgroups rubbish --- */ - for (sym_createIter(&i, &netg__table); (sng = sym_next(&i)) != 0; ) { + for (sym_mkiter(&i, &netg__table); (sng = sym_next(&i)) != 0; ) { c = sng->cons; while (c) { cc = c->cdr; @@ -643,6 +658,7 @@ void netg_reinit(void) if (c->car.atom->h) free(c->car.atom->h); if (c->car.atom->u) free(c->car.atom->u); if (c->car.atom->d) free(c->car.atom->d); + free(c->car.atom); } free(c); c = cc; @@ -650,9 +666,7 @@ void netg_reinit(void) sym_remove(&netg__table, sng); } - /* --- Now rebuild the world --- */ - - netg_init(); + sym_destroy(&netg__table); } /*----- Test driver -------------------------------------------------------*/ @@ -670,7 +684,7 @@ int main(void) { netg *n; ego("netg-test"); - traceon(stderr, TRACE_ALL); + trace_on(stderr, TRACE_ALL); netg_init(); for (netg_iterate(); (n = netg_next()) != 0; ) { fprintf(stderr, "netgroup %s\n", netg_name(n));