X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/become/blobdiff_plain/fe59d3d70fc7337b7a50c4fcff72d20967672157..f60a34341fee6aafd5b878dce23b80af7c60064d:/src/netg.c

diff --git a/src/netg.c b/src/netg.c
index c198219..f211389 100644
--- a/src/netg.c
+++ b/src/netg.c
@@ -1,6 +1,6 @@
 /* -*-c-*-
  *
- * $Id: netg.c,v 1.4 1998/04/23 13:24:49 mdw Exp $
+ * $Id: netg.c,v 1.5 2003/10/12 00:14:55 mdw Exp $
  *
  * A local database of netgroups
  *
@@ -29,6 +29,10 @@
 /*----- Revision history --------------------------------------------------*
  *
  * $Log: netg.c,v $
+ * 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.
  *
@@ -67,14 +71,19 @@
 #include <netdb.h>
 #include <unistd.h>
 
+/* --- mLib headers --- */
+
+#include <mLib/alloc.h>
+#include <mLib/report.h>
+#include <mLib/sym.h>
+#include <mLib/trace.h>
+
 /* --- 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 --------------------------------------------------*/
@@ -360,7 +369,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)
 {
@@ -409,7 +418,7 @@ static void netg__dumpGroup(netg__cons *c, int lev)
  * Use:		Dumps the netgroups table.
  */
 
-#ifdef TRACING
+#ifndef NTRACE
 
 static void netg__dump(void)
 {
@@ -417,7 +426,7 @@ static void netg__dump(void)
   netg__sym *sng;
 
   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);
@@ -436,7 +445,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@ --- *
  *
@@ -557,7 +566,7 @@ void netg_init(void)
 {
   /* --- Initialise my symbol table --- */
 
-  sym_createTable(&netg__table);
+  sym_create(&netg__table);
 
   /* --- Bind myself unto a YP server --- */
 
@@ -584,7 +593,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;
@@ -609,9 +618,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);
   }    
 
@@ -637,7 +646,7 @@ void netg_end(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;
@@ -654,7 +663,7 @@ void netg_end(void)
     sym_remove(&netg__table, sng);
   }
 
-  sym_destroyTable(&netg__table);
+  sym_destroy(&netg__table);
 }
 
 /*----- Test driver -------------------------------------------------------*/