[Nufw-devel] [PATCH 3 of 5] Ignore ACL when no group is specified

[Mikael Berthe]

# HG changeset patch
# User Mikael Berthe <address@hidden>
# Node ID 033d2becb056050a947c608d44b9b9e1950bbde0
# Parent  b0e7c79601ca4bb8a504f873e2a11cd6e43c2d34
Ignore ACL when no group is specified
(svn revision r863)

diff -r b0e7c79601ca -r 033d2becb056 src/nuauth/modules/plaintext/plaintext.c
--- a/src/nuauth/modules/plaintext/plaintext.c  Sun Oct 23 19:15:45 2005 +0200
+++ b/src/nuauth/modules/plaintext/plaintext.c  Sun Oct 23 19:15:49 2005 +0200
@@ -416,10 +416,15 @@
               if (DEBUG_OR_NOT(DEBUG_LEVEL_VERBOSE_DEBUG,DEBUG_AREA_MAIN))
                   g_message("Done with ACL [%s]", newacl->aclname);
 #endif
-              // check if ACL node has minimal information (protocol?)
+              // check if ACL node has minimal information
               // Warning: this code is duplicated after the loop
-              if (newacl->proto == IPPROTO_TCP || newacl->proto == IPPROTO_UDP
-                      || newacl->proto == IPPROTO_ICMP) {
+              if (!newacl->groups) {
+                  if (DEBUG_OR_NOT(DEBUG_LEVEL_WARNING,DEBUG_AREA_AUTH))
+                      g_message("No group(s) declared in ACL %s",
+                              newacl->aclname);
+              } else if (newacl->proto == IPPROTO_TCP ||
+                         newacl->proto == IPPROTO_UDP ||
+                         newacl->proto == IPPROTO_ICMP) {
                   // ACL node is ready
                   plaintext_acllist = g_slist_prepend(plaintext_acllist, 
newacl);
               } else {
@@ -621,10 +626,15 @@
       if (DEBUG_OR_NOT(DEBUG_LEVEL_VERBOSE_DEBUG,DEBUG_AREA_MAIN))
           g_message("Done with ACL [%s]", newacl->aclname);
 #endif
-      // check if ACL node has minimal information (protocol?)
+      // check if ACL node has minimal information
       // Warning: this code is duplicated after the loop
-      if (newacl->proto == IPPROTO_TCP || newacl->proto == IPPROTO_UDP ||
-              newacl->proto == IPPROTO_ICMP) {
+      if (!newacl->groups) {
+          if (DEBUG_OR_NOT(DEBUG_LEVEL_WARNING,DEBUG_AREA_AUTH))
+              g_message("No group(s) declared in ACL %s",
+                      newacl->aclname);
+      } else if (newacl->proto == IPPROTO_TCP ||
+                 newacl->proto == IPPROTO_UDP ||
+                 newacl->proto == IPPROTO_ICMP) {
           // ACL node is ready
           plaintext_acllist = g_slist_prepend(plaintext_acllist, newacl);
       } else if (DEBUG_OR_NOT(DEBUG_LEVEL_WARNING,DEBUG_AREA_AUTH))