[GNUnet-SVN] r6779 - in GNUnet: . src/server

[gnunet]

Author: grothoff
Date: 2008-05-06 04:09:55 -0600 (Tue, 06 May 2008)
New Revision: 6779

Modified:
   GNUnet/ChangeLog
   GNUnet/src/server/core.c
   GNUnet/todo
Log:
sanity check

Modified: GNUnet/ChangeLog
===================================================================
--- GNUnet/ChangeLog    2008-05-05 15:18:50 UTC (rev 6778)
+++ GNUnet/ChangeLog    2008-05-06 10:09:55 UTC (rev 6779)
@@ -1,3 +1,6 @@
+Tue May  6 04:10:02 MDT 2008
+       Added simple sanity check for [MODULES] values.
+
 Thu Apr 24 00:05:17 MDT 2008
        Simplified FSUI stop/abort/pause/resume API calls
        (no need to pass FSUI context anymore).

Modified: GNUnet/src/server/core.c
===================================================================
--- GNUnet/src/server/core.c    2008-05-05 15:18:50 UTC (rev 6778)
+++ GNUnet/src/server/core.c    2008-05-06 10:09:55 UTC (rev 6779)
@@ -110,6 +110,18 @@
                                                       &pos))
     return GNUNET_SYSERR;
   GNUNET_GE_ASSERT (applicationCore.ectx, pos != NULL);
+  if (pos != strstr(pos, rpos))
+    {
+      GNUNET_GE_LOG (applicationCore.ectx,
+                    GNUNET_GE_ERROR | GNUNET_GE_DEVELOPER |
+                    GNUNET_GE_BULK,
+                    _
+                    ("Configuration value `%s' under [MODULES] for `%s' is 
invalid!\n"),
+                    pos,
+                    rpos);
+      GNUNET_free(pos);
+      return GNUNET_SYSERR;
+    }
   name = GNUNET_malloc (strlen (pos) + strlen ("module_") + 1);
   strcpy (name, "module_");
   strcat (name, pos);
@@ -298,6 +310,18 @@
                                                       &pos))
     return NULL;
   GNUNET_GE_ASSERT (applicationCore.ectx, pos != NULL);
+  if (pos != strstr(pos, rpos))
+    {
+      GNUNET_GE_LOG (applicationCore.ectx,
+                    GNUNET_GE_ERROR | GNUNET_GE_DEVELOPER |
+                    GNUNET_GE_BULK,
+                    _
+                    ("Configuration value `%s' under [MODULES] for `%s' is 
invalid!\n"),
+                    pos,
+                    rpos);
+      GNUNET_free(pos);
+      return GNUNET_SYSERR;
+    }
   name = GNUNET_malloc (strlen (pos) + strlen ("module_") + 1);
   strcpy (name, "module_");
   strcat (name, pos);

Modified: GNUnet/todo
===================================================================
--- GNUnet/todo 2008-05-05 15:18:50 UTC (rev 6778)
+++ GNUnet/todo 2008-05-06 10:09:55 UTC (rev 6779)
@@ -4,8 +4,6 @@
   RC == Release Critical
 
 0.8.0 [4'08] (aka "advanced features"):
-- add code to check that [MODULES] configuration entries are
-  at least superficially valid (matching strings...)
 - document gnunet-auto-share on webpage [RC]
 - clean up and test VPN code [RC]
 - tune GAP query planning code [RC]