X-Git-Url: https://git.distorted.org.uk/~mdw/become/blobdiff_plain/03f996bd8a0d6391518979cdab3dbe38cba0bf83..c758e6541ca05409b178dd9629e9337494c49890:/src/rule.c

diff --git a/src/rule.c b/src/rule.c
index 41fa371..83fe6f4 100644
--- a/src/rule.c
+++ b/src/rule.c
@@ -1,10 +1,10 @@
 /* -*-c-*-
  *
- * $Id: rule.c,v 1.2 1997/08/04 10:24:25 mdw Exp $
+ * $Id: rule.c,v 1.5 1998/01/12 16:46:25 mdw Exp $
  *
  * Managing rule sets
  *
- * (c) 1997 EBI
+ * (c) 1998 EBI
  */
 
 /*----- Licensing notice --------------------------------------------------*
@@ -29,6 +29,16 @@
 /*----- Revision history --------------------------------------------------*
  *
  * $Log: rule.c,v $
+ * Revision 1.5  1998/01/12 16:46:25  mdw
+ * Fix copyright date.
+ *
+ * Revision 1.4  1997/09/17  10:27:17  mdw
+ * Use rewritten class handler.
+ *
+ * Revision 1.3  1997/08/20  16:22:36  mdw
+ * Rename `rule_reinit' to `rule_end' for more sensible restart.  Don't try
+ * to trace when tracing's turned off.
+ *
  * Revision 1.2  1997/08/04 10:24:25  mdw
  * Sources placed under CVS control.
  *
@@ -68,10 +78,10 @@
 
 typedef struct rule {
   struct rule *next;			/* Next rule in the list */
-  classdef *host;			/* Hosts this rule applies to */
-  classdef *from;			/* From users in this class */
-  classdef *to;				/* To users in this class */
-  classdef *cmd;			/* To run commands in this class */
+  class_node *host;			/* Hosts this rule applies to */
+  class_node *from;			/* From users in this class */
+  class_node *to;				/* To users in this class */
+  class_node *cmd;			/* To run commands in this class */
 } rule;
 
 /*----- Static variables --------------------------------------------------*/
@@ -96,42 +106,44 @@ void rule_init(void)
   rule__tail = (rule *)&rule__list;
 }
 
-/* --- @rule_reinit@ --- *
+/* --- @rule_end@ --- *
  *
  * Arguments:	---
  *
  * Returns:	---
  *
- * Use:		Reinitialises the rule database.
+ * Use:		Empties the rule database.
  */
 
-void rule_reinit(void)
+void rule_end(void)
 {
   rule *r = rule__list;
   rule *rr;
 
   while (r) {
     rr = r->next;
+    class_dec(r->host);
+    class_dec(r->from);
+    class_dec(r->to);
+    class_dec(r->cmd);
     free(r);
     r = rr;
   }
-
-  rule_init();
 }
 
 /* --- @rule_add@ --- *
  *
- * Arguments:	@classdef *host@ = class of hosts this rule applies to
- *		@classdef *from@ = class of users allowed to change
- *		@classdef *to@ = class of users allowed to be changed to
- *		@classdef *cmd@ = class of commands allowed
+ * Arguments:	@class_node *host@ = class of hosts this rule applies to
+ *		@class_node *from@ = class of users allowed to change
+ *		@class_node *to@ = class of users allowed to be changed to
+ *		@class_node *cmd@ = class of commands allowed
  *
  * Returns:	---
  *
  * Use:		Registers another rule.
  */
 
-void rule_add(classdef *host, classdef *from, classdef *to, classdef *cmd)
+void rule_add(class_node *host, class_node *from, class_node *to, class_node *cmd)
 {
   rule *r = xmalloc(sizeof(*r));
 
@@ -180,18 +192,18 @@ int rule_check(request *r)
 
     IF_TRACING(TRACE_RULE, {
       trace(TRACE_RULE, "rule: check against rule...");
-      trace(TRACE_RULE, "  from"); class_dump(rr->from);
-      trace(TRACE_RULE, "  to"); class_dump(rr->to);
-      trace(TRACE_RULE, "  cmd"); class_dump(rr->cmd);
-      trace(TRACE_RULE, "  host"); class_dump(rr->host);
+      trace(TRACE_RULE, "rule:   from"); class_dump(rr->from, 2);
+      trace(TRACE_RULE, "rule:   to"); class_dump(rr->to, 2);
+      trace(TRACE_RULE, "rule:   cmd"); class_dump(rr->cmd, 2);
+      trace(TRACE_RULE, "rule:   host"); class_dump(rr->host, 2);
     })
 
     /* --- Check the rule --- */
 
-    if (class_userMatch(rr->from, r->from) &&
-	class_userMatch(rr->to, r->to) &&
-	class_commandMatch(rr->cmd, r->cmd) &&
-	class_hostMatch(rr->host, r->host)) {
+    if (class_matchUser(rr->from, r->from) &&
+	class_matchUser(rr->to, r->to) &&
+	class_matchCommand(rr->cmd, r->cmd) &&
+	class_matchHost(rr->host, r->host)) {
       T( trace(TRACE_CHECK, "check: rule matched -- granting permission"); )
       return (1);
     }
@@ -214,18 +226,20 @@ int rule_check(request *r)
 
 void rule_dump(void)
 {
+#ifdef TRACING
   rule *rr = rule__list;
 
   trace(TRACE_RULE, "rule: dumping rules");
   while (rr) {
-    trace(TRACE_RULE, "rule dump...");
-    trace(TRACE_RULE, "  from"); class_dump(rr->from);
-    trace(TRACE_RULE, "  to"); class_dump(rr->to);
-    trace(TRACE_RULE, "  cmd"); class_dump(rr->cmd);
-    trace(TRACE_RULE, "  host"); class_dump(rr->host);
+    trace(TRACE_RULE, "rule: rule dump...");
+    trace(TRACE_RULE, "rule:   from"); class_dump(rr->from, 2);
+    trace(TRACE_RULE, "rule:   to"); class_dump(rr->to, 2);
+    trace(TRACE_RULE, "rule:   cmd"); class_dump(rr->cmd, 2);
+    trace(TRACE_RULE, "rule:   host"); class_dump(rr->host, 2);
     rr = rr->next;
   }
   trace(TRACE_RULE, "rule: dump finished");
+#endif
 }
 
 /*----- That's all, folks -------------------------------------------------*/