const-ing of config-handles

11 files changed, 62 insertions, 86 deletions

diff --git a/src/util/client.c b/src/util/client.c
index 7d380fa5c..ab50d9d4d 100644
--- a/src/util/client.c
+++ b/src/util/client.c
@@ -124,7 +124,7 @@ struct GNUNET_CLIENT_Connection
 struct GNUNET_CLIENT_Connection *
 GNUNET_CLIENT_connect (struct GNUNET_SCHEDULER_Handle *sched,
                        const char *service_name,
-                       struct GNUNET_CONFIGURATION_Handle *cfg)
+                       const struct GNUNET_CONFIGURATION_Handle *cfg)
 {
   struct GNUNET_CLIENT_Connection *ret;
   struct GNUNET_NETWORK_SocketHandle *sock;
@@ -455,7 +455,7 @@ write_test (void *cls, size_t size, void *buf)
 void
 GNUNET_CLIENT_service_test (struct GNUNET_SCHEDULER_Handle *sched,
                             const char *service,
-                            struct GNUNET_CONFIGURATION_Handle *cfg,
+                            const struct GNUNET_CONFIGURATION_Handle *cfg,
                             struct GNUNET_TIME_Relative timeout,
                             GNUNET_SCHEDULER_Task task, void *task_cls)
 {
diff --git a/src/util/configuration.c b/src/util/configuration.c
index eacbdbf05..769d2aadc 100644
--- a/src/util/configuration.c
+++ b/src/util/configuration.c
@@ -235,7 +235,7 @@ GNUNET_CONFIGURATION_parse (struct GNUNET_CONFIGURATION_Handle *cfg,
 }
 
 int
-GNUNET_CONFIGURATION_test_dirty (struct GNUNET_CONFIGURATION_Handle *cfg)
+GNUNET_CONFIGURATION_test_dirty (const struct GNUNET_CONFIGURATION_Handle *cfg)
 {
   return cfg->dirty;
 }
@@ -316,7 +316,7 @@ GNUNET_CONFIGURATION_write (struct GNUNET_CONFIGURATION_Handle *data,
 
 
 static struct ConfigSection *
-findSection (struct GNUNET_CONFIGURATION_Handle *data, const char *section)
+findSection (const struct GNUNET_CONFIGURATION_Handle *data, const char *section)
 {
   struct ConfigSection *pos;
 
@@ -328,7 +328,7 @@ findSection (struct GNUNET_CONFIGURATION_Handle *data, const char *section)
 
 
 static struct ConfigEntry *
-findEntry (struct GNUNET_CONFIGURATION_Handle *data,
+findEntry (const struct GNUNET_CONFIGURATION_Handle *data,
            const char *section, const char *key)
 {
   struct ConfigSection *sec;
@@ -386,7 +386,7 @@ GNUNET_CONFIGURATION_set_value_number (struct GNUNET_CONFIGURATION_Handle
 }
 
 int
-GNUNET_CONFIGURATION_get_value_number (struct GNUNET_CONFIGURATION_Handle
+GNUNET_CONFIGURATION_get_value_number (const struct GNUNET_CONFIGURATION_Handle
                                        *cfg, const char *section,
                                        const char *option,
                                        unsigned long long *number)
@@ -402,7 +402,7 @@ GNUNET_CONFIGURATION_get_value_number (struct GNUNET_CONFIGURATION_Handle
 }
 
 int
-GNUNET_CONFIGURATION_get_value_time (struct GNUNET_CONFIGURATION_Handle
+GNUNET_CONFIGURATION_get_value_time (const struct GNUNET_CONFIGURATION_Handle
                                      *cfg, const char *section,
                                      const char *option,
                                      struct GNUNET_TIME_Relative *time)
@@ -420,7 +420,7 @@ GNUNET_CONFIGURATION_get_value_time (struct GNUNET_CONFIGURATION_Handle
 }
 
 int
-GNUNET_CONFIGURATION_get_value_string (struct GNUNET_CONFIGURATION_Handle
+GNUNET_CONFIGURATION_get_value_string (const struct GNUNET_CONFIGURATION_Handle
                                        *cfg, const char *section,
                                        const char *option, char **value)
 {
@@ -437,7 +437,7 @@ GNUNET_CONFIGURATION_get_value_string (struct GNUNET_CONFIGURATION_Handle
 }
 
 int
-GNUNET_CONFIGURATION_get_value_choice (struct GNUNET_CONFIGURATION_Handle
+GNUNET_CONFIGURATION_get_value_choice (const struct GNUNET_CONFIGURATION_Handle
                                        *cfg, const char *section,
                                        const char *option,
                                        const char **choices,
@@ -473,7 +473,7 @@ GNUNET_CONFIGURATION_get_value_choice (struct GNUNET_CONFIGURATION_Handle
  * @return GNUNET_YES if so, GNUNET_NO if not.
  */
 int
-GNUNET_CONFIGURATION_have_value (struct GNUNET_CONFIGURATION_Handle *cfg,
+GNUNET_CONFIGURATION_have_value (const struct GNUNET_CONFIGURATION_Handle *cfg,
                                  const char *section, const char *option)
 {
   struct ConfigEntry *e;
@@ -491,7 +491,7 @@ GNUNET_CONFIGURATION_have_value (struct GNUNET_CONFIGURATION_Handle *cfg,
  * @return $-expanded string
  */
 char *
-GNUNET_CONFIGURATION_expand_dollar (struct GNUNET_CONFIGURATION_Handle *cfg,
+GNUNET_CONFIGURATION_expand_dollar (const struct GNUNET_CONFIGURATION_Handle *cfg,
                                     char *orig)
 {
   int i;
@@ -543,7 +543,7 @@ GNUNET_CONFIGURATION_expand_dollar (struct GNUNET_CONFIGURATION_Handle *cfg,
  * @return GNUNET_OK on success, GNUNET_SYSERR on error
  */
 int
-GNUNET_CONFIGURATION_get_value_filename (struct GNUNET_CONFIGURATION_Handle
+GNUNET_CONFIGURATION_get_value_filename (const struct GNUNET_CONFIGURATION_Handle
                                          *data, const char *section,
                                          const char *option, char **value)
 {
@@ -574,7 +574,7 @@ GNUNET_CONFIGURATION_get_value_filename (struct GNUNET_CONFIGURATION_Handle
  * @return GNUNET_YES, GNUNET_NO or GNUNET_SYSERR
  */
 int
-GNUNET_CONFIGURATION_get_value_yesno (struct GNUNET_CONFIGURATION_Handle *cfg,
+GNUNET_CONFIGURATION_get_value_yesno (const struct GNUNET_CONFIGURATION_Handle *cfg,
                                       const char *section, const char *option)
 {
   static const char *yesno[] = { "YES", "NO", NULL };
@@ -597,7 +597,7 @@ GNUNET_CONFIGURATION_get_value_yesno (struct GNUNET_CONFIGURATION_Handle *cfg,
  * @return number of filenames iterated over, -1 on error
  */
 int
-GNUNET_CONFIGURATION_iterate_value_filenames (struct
+GNUNET_CONFIGURATION_iterate_value_filenames (const struct
                                               GNUNET_CONFIGURATION_Handle
                                               *cfg, const char *section,
                                               const char *option,
diff --git a/src/util/disk.c b/src/util/disk.c
index b0f92c7f2..ff4aff1f7 100644
--- a/src/util/disk.c
+++ b/src/util/disk.c
@@ -1132,6 +1132,7 @@ GNUNET_DISK_file_close (struct GNUNET_DISK_FileHandle *h)
  * a directory, end the last argument in '/' (or pass
  * DIR_SEPARATOR_STR as the last argument before NULL).
  *
+ * @param cfg configuration to use (determines HOME)
  * @param serviceName name of the service
  * @param varargs is NULL-terminated list of
  *                path components to append to the
@@ -1139,7 +1140,7 @@ GNUNET_DISK_file_close (struct GNUNET_DISK_FileHandle *h)
  * @return the constructed filename
  */
 char *
-GNUNET_DISK_get_home_filename (struct GNUNET_CONFIGURATION_Handle *cfg,
+GNUNET_DISK_get_home_filename (const struct GNUNET_CONFIGURATION_Handle *cfg,
                                const char *serviceName, ...)
 {
   const char *c;
diff --git a/src/util/getopt.c b/src/util/getopt.c
index e069e76f7..799146e77 100644
--- a/src/util/getopt.c
+++ b/src/util/getopt.c
@@ -997,7 +997,6 @@ GNgetopt_long (int argc,
  */
 int
 GNUNET_GETOPT_run (const char *binaryOptions,
-                   struct GNUNET_CONFIGURATION_Handle *cfg,
                    const struct GNUNET_GETOPT_CommandLineOption *allOptions,
                    unsigned int argc, char *const *argv)
 {
@@ -1017,7 +1016,6 @@ GNUNET_GETOPT_run (const char *binaryOptions,
   clpc.allOptions = allOptions;
   clpc.argv = argv;
   clpc.argc = argc;
-  clpc.cfg = cfg;
   count = 0;
   while (allOptions[count].name != NULL)
     count++;
diff --git a/src/util/os_load.c b/src/util/os_load.c
index d1115e33f..21e74eb49 100644
--- a/src/util/os_load.c
+++ b/src/util/os_load.c
@@ -517,7 +517,7 @@ updateUsage ()
  * that lock has already been obtained.
  */
 static void
-updateAgedLoad (struct GNUNET_CONFIGURATION_Handle *cfg)
+updateAgedLoad (const struct GNUNET_CONFIGURATION_Handle *cfg)
 {
   static struct GNUNET_TIME_Absolute lastCall;
 
@@ -573,7 +573,7 @@ updateAgedLoad (struct GNUNET_CONFIGURATION_Handle *cfg)
  *        (100 is equivalent to full load)
  */
 int
-GNUNET_OS_load_cpu_get (struct GNUNET_CONFIGURATION_Handle *cfg)
+GNUNET_OS_load_cpu_get (const struct GNUNET_CONFIGURATION_Handle *cfg)
 {
   unsigned long long maxCPULoad;
   int ret;
@@ -596,7 +596,7 @@ GNUNET_OS_load_cpu_get (struct GNUNET_CONFIGURATION_Handle *cfg)
  *        (100 is equivalent to full load)
  */
 int
-GNUNET_OS_load_disk_get (struct GNUNET_CONFIGURATION_Handle *cfg)
+GNUNET_OS_load_disk_get (const struct GNUNET_CONFIGURATION_Handle *cfg)
 {
   unsigned long long maxIOLoad;
   int ret;
diff --git a/src/util/program.c b/src/util/program.c
index c8ebfc4eb..0cff324f8 100644
--- a/src/util/program.c
+++ b/src/util/program.c
@@ -63,7 +63,7 @@ struct CommandContext
   /**
    * Configuration to use.
    */
-  struct GNUNET_CONFIGURATION_Handle *cfg;
+  const struct GNUNET_CONFIGURATION_Handle *cfg;
 
 };
 
@@ -127,6 +127,7 @@ GNUNET_PROGRAM_run (int argc,
   char *loglev;
   int ret;
   unsigned int cnt;
+  struct GNUNET_CONFIGURATION_Handle *cfg;
   struct GNUNET_GETOPT_CommandLineOption defoptions[] = {
     GNUNET_GETOPT_OPTION_CFG_FILE (&cc.cfgfile),
     GNUNET_GETOPT_OPTION_HELP (binaryHelp),
@@ -139,7 +140,7 @@ GNUNET_PROGRAM_run (int argc,
   loglev = NULL;
   cc.task = task;
   cc.task_cls = task_cls;
-  cc.cfg = GNUNET_CONFIGURATION_create ();
+  cc.cfg = cfg = GNUNET_CONFIGURATION_create ();
 
   /* prepare */
 #if ENABLE_NLS
@@ -169,15 +170,14 @@ GNUNET_PROGRAM_run (int argc,
   qsort (allopts, cnt, sizeof (struct GNUNET_GETOPT_CommandLineOption),
          &cmd_sorter);
   loglev = GNUNET_strdup ("WARNING");
-  if ((-1 == (ret = GNUNET_GETOPT_run (binaryName,
-                                       cc.cfg,
+  if ((-1 == (ret = GNUNET_GETOPT_run (binaryName,                                      
                                        allopts,
                                        (unsigned int) argc, argv))) ||
       ((GNUNET_OK !=
         GNUNET_log_setup (binaryName,
                           loglev,
                           NULL)) ||
-       (GNUNET_OK != GNUNET_CONFIGURATION_load (cc.cfg, cc.cfgfile))))
+       (GNUNET_OK != GNUNET_CONFIGURATION_load (cfg, cc.cfgfile))))
 
     {
       GNUNET_free_non_null (cc.cfgfile);
@@ -192,7 +192,7 @@ GNUNET_PROGRAM_run (int argc,
   GNUNET_SCHEDULER_run (&program_main, &cc);
 
   /* clean up */
-  GNUNET_CONFIGURATION_destroy (cc.cfg);
+  GNUNET_CONFIGURATION_destroy (cfg);
   GNUNET_free_non_null (cc.cfgfile);
   GNUNET_free (loglev);
   return GNUNET_OK;
diff --git a/src/util/pseudonym.c b/src/util/pseudonym.c
index 52351c2c8..5bf336060 100644
--- a/src/util/pseudonym.c
+++ b/src/util/pseudonym.c
@@ -64,7 +64,7 @@ internal_notify (const GNUNET_HashCode * id,
  * a new pseudonym.
  */
 int
-GNUNET_PSEUDONYM_discovery_callback_register (struct
+GNUNET_PSEUDONYM_discovery_callback_register (const struct
                                               GNUNET_CONFIGURATION_Handle
                                               *cfg,
                                               GNUNET_PSEUDONYM_Iterator
@@ -115,7 +115,7 @@ GNUNET_PSEUDONYM_discovery_callback_unregister (GNUNET_PSEUDONYM_Iterator
  * pseudonym identifier and directory prefix.
  */
 static char *
-get_data_filename (struct GNUNET_CONFIGURATION_Handle
+get_data_filename (const struct GNUNET_CONFIGURATION_Handle
                    *cfg, const char *prefix, const GNUNET_HashCode * psid)
 {
   struct GNUNET_CRYPTO_HashAsciiEncoded enc;
@@ -131,7 +131,7 @@ get_data_filename (struct GNUNET_CONFIGURATION_Handle
 }
 
 static void
-write_pseudonym_info (struct GNUNET_CONFIGURATION_Handle *cfg,
+write_pseudonym_info (const struct GNUNET_CONFIGURATION_Handle *cfg,
                       const GNUNET_HashCode * nsid,
                       const struct GNUNET_CONTAINER_MetaData *meta,
                       int32_t ranking, const char *ns_name)
@@ -179,7 +179,7 @@ write_pseudonym_info (struct GNUNET_CONFIGURATION_Handle *cfg,
 }
 
 static int
-read_info (struct GNUNET_CONFIGURATION_Handle *cfg,
+read_info (const struct GNUNET_CONFIGURATION_Handle *cfg,
            const GNUNET_HashCode * nsid,
            struct GNUNET_CONTAINER_MetaData **meta,
            int32_t * ranking, char **ns_name)
@@ -273,7 +273,7 @@ read_info (struct GNUNET_CONFIGURATION_Handle *cfg,
  * @return NULL on failure (should never happen)
  */
 char *
-GNUNET_PSEUDONYM_id_to_name (struct GNUNET_CONFIGURATION_Handle *cfg,
+GNUNET_PSEUDONYM_id_to_name (const struct GNUNET_CONFIGURATION_Handle *cfg,
                              const GNUNET_HashCode * nsid)
 {
   struct GNUNET_CONTAINER_MetaData *meta;
@@ -356,7 +356,7 @@ GNUNET_PSEUDONYM_id_to_name (struct GNUNET_CONFIGURATION_Handle *cfg,
  * @return GNUNET_OK on success
  */
 int
-GNUNET_PSEUDONYM_name_to_id (struct GNUNET_CONFIGURATION_Handle *cfg,
+GNUNET_PSEUDONYM_name_to_id (const struct GNUNET_CONFIGURATION_Handle *cfg,
                              const char *ns_uname, GNUNET_HashCode * nsid)
 {
   size_t slen;
@@ -408,7 +408,7 @@ struct ListPseudonymClosure
 {
   GNUNET_PSEUDONYM_Iterator iterator;
   void *closure;
-  struct GNUNET_CONFIGURATION_Handle *cfg;
+  const struct GNUNET_CONFIGURATION_Handle *cfg;
 };
 
 static int
@@ -443,7 +443,7 @@ list_pseudonym_helper (void *cls, const char *fullname)
  * List all available pseudonyms.
  */
 int
-GNUNET_PSEUDONYM_list_all (struct GNUNET_CONFIGURATION_Handle *cfg,
+GNUNET_PSEUDONYM_list_all (const struct GNUNET_CONFIGURATION_Handle *cfg,
                            GNUNET_PSEUDONYM_Iterator iterator, void *closure)
 {
   struct ListPseudonymClosure cls;
@@ -470,7 +470,7 @@ GNUNET_PSEUDONYM_list_all (struct GNUNET_CONFIGURATION_Handle *cfg,
  * @return new rating of the pseudonym
  */
 int
-GNUNET_PSEUDONYM_rank (struct GNUNET_CONFIGURATION_Handle *cfg,
+GNUNET_PSEUDONYM_rank (const struct GNUNET_CONFIGURATION_Handle *cfg,
                        const GNUNET_HashCode * nsid, int delta)
 {
   struct GNUNET_CONTAINER_MetaData *meta;
@@ -513,7 +513,7 @@ merge_meta_helper (EXTRACTOR_KeywordType type, const char *data, void *cls)
  * @param id the pseudonym identifier
  */
 void
-GNUNET_PSEUDONYM_add (struct GNUNET_CONFIGURATION_Handle *cfg,
+GNUNET_PSEUDONYM_add (const struct GNUNET_CONFIGURATION_Handle *cfg,
                       const GNUNET_HashCode * id,
                       const struct GNUNET_CONTAINER_MetaData *meta)
 {
diff --git a/src/util/service.c b/src/util/service.c
index 0569a0fde..a976fab78 100644
--- a/src/util/service.c
+++ b/src/util/service.c
@@ -420,7 +420,7 @@ struct GNUNET_SERVICE_Context
   /**
    * Our configuration.
    */
-  struct GNUNET_CONFIGURATION_Handle *cfg;
+  const struct GNUNET_CONFIGURATION_Handle *cfg;
 
   /**
    * Handle for the server.
@@ -1264,6 +1264,7 @@ GNUNET_SERVICE_run (int argc,
   char *logfile;
   int do_daemonize;
   struct GNUNET_SERVICE_Context sctx;
+  struct GNUNET_CONFIGURATION_Handle *cfg;
   struct GNUNET_GETOPT_CommandLineOption service_options[] = {
     GNUNET_GETOPT_OPTION_CFG_FILE (&cfg_fn),
     {'d', "daemonize", NULL,
@@ -1286,18 +1287,17 @@ GNUNET_SERVICE_run (int argc,
   sctx.maxbuf = GNUNET_SERVER_MAX_MESSAGE_SIZE;
   sctx.task = task;
   sctx.serviceName = serviceName;
-  sctx.cfg = GNUNET_CONFIGURATION_create ();
+  sctx.cfg = cfg = GNUNET_CONFIGURATION_create ();
   /* setup subsystems */
   if ((GNUNET_SYSERR ==
-       GNUNET_GETOPT_run (serviceName,
-                          sctx.cfg,
+       GNUNET_GETOPT_run (serviceName,                         
                           service_options,
                           argc,
                           argv)) ||
       (GNUNET_OK !=
        GNUNET_log_setup (serviceName, loglev, logfile)) ||
       (GNUNET_OK !=
-       GNUNET_CONFIGURATION_load (sctx.cfg, cfg_fn)) ||
+       GNUNET_CONFIGURATION_load (cfg, cfg_fn)) ||
       (GNUNET_OK !=
        setup_service (&sctx)) ||
       ((do_daemonize == 1) &&
@@ -1310,7 +1310,7 @@ GNUNET_SERVICE_run (int argc,
             GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "write");
           GNUNET_break (0 == CLOSE (sctx.ready_confirm_fd));
         }
-      GNUNET_CONFIGURATION_destroy (sctx.cfg);
+      GNUNET_CONFIGURATION_destroy (cfg);
       GNUNET_free_non_null (sctx.addr);
       GNUNET_free_non_null (logfile);
       GNUNET_free (loglev);
@@ -1339,7 +1339,7 @@ GNUNET_SERVICE_run (int argc,
   if (sctx.server != NULL)
     GNUNET_SERVER_destroy (sctx.server);
   GNUNET_free_non_null (sctx.my_handlers);
-  GNUNET_CONFIGURATION_destroy (sctx.cfg);
+  GNUNET_CONFIGURATION_destroy (cfg);
   GNUNET_free_non_null (sctx.addr);
   GNUNET_free_non_null (logfile);
   GNUNET_free (loglev);
@@ -1364,7 +1364,7 @@ GNUNET_SERVICE_run (int argc,
 struct GNUNET_SERVICE_Context *
 GNUNET_SERVICE_start (const char *serviceName,
                       struct GNUNET_SCHEDULER_Handle *sched,
-                      struct GNUNET_CONFIGURATION_Handle *cfg)
+                      const struct GNUNET_CONFIGURATION_Handle *cfg)
 {
   int i;
   struct GNUNET_SERVICE_Context *sctx;
diff --git a/src/util/test_getopt.c b/src/util/test_getopt.c
index 89e7be863..7168dd8c1 100644
--- a/src/util/test_getopt.c
+++ b/src/util/test_getopt.c
@@ -31,7 +31,6 @@
 static int
 testMinimal ()
 {
-  struct GNUNET_CONFIGURATION_Handle *cfg;
   char *const emptyargv[] = {
     "test",
     NULL
@@ -40,13 +39,8 @@ testMinimal ()
     GNUNET_GETOPT_OPTION_END
   };
 
-  cfg = GNUNET_CONFIGURATION_create ();
-  if (1 != GNUNET_GETOPT_run ("test", cfg, emptyoptionlist, 1, emptyargv))
-    {
-      GNUNET_CONFIGURATION_destroy (cfg);
-      return 1;
-    }
-  GNUNET_CONFIGURATION_destroy (cfg);
+  if (1 != GNUNET_GETOPT_run ("test", emptyoptionlist, 1, emptyargv))
+    return 1;
 
   return 0;
 }
@@ -54,7 +48,6 @@ testMinimal ()
 static int
 testVerbose ()
 {
-  struct GNUNET_CONFIGURATION_Handle *cfg;
   char *const myargv[] = {
     "test",
     "-V",
@@ -68,14 +61,11 @@ testVerbose ()
     GNUNET_GETOPT_OPTION_END
   };
 
-  cfg = GNUNET_CONFIGURATION_create ();
-  if (3 != GNUNET_GETOPT_run ("test", cfg, verboseoptionlist, 4, myargv))
+  if (3 != GNUNET_GETOPT_run ("test", verboseoptionlist, 4, myargv))
     {
       GNUNET_break (0);
-      GNUNET_CONFIGURATION_destroy (cfg);
       return 1;
     }
-  GNUNET_CONFIGURATION_destroy (cfg);
   if (vflags != 2)
     {
       GNUNET_break (0);
@@ -87,7 +77,6 @@ testVerbose ()
 static int
 testVersion ()
 {
-  struct GNUNET_CONFIGURATION_Handle *cfg;
   char *const myargv[] = {
     "test_getopt",
     "-v",
@@ -98,22 +87,18 @@ testVersion ()
     GNUNET_GETOPT_OPTION_END
   };
 
-  cfg = GNUNET_CONFIGURATION_create ();
   if (-1 != GNUNET_GETOPT_run ("test_getopt",
-                               cfg, versionoptionlist, 2, myargv))
+                               versionoptionlist, 2, myargv))
     {
       GNUNET_break (0);
-      GNUNET_CONFIGURATION_destroy (cfg);
       return 1;
     }
-  GNUNET_CONFIGURATION_destroy (cfg);
   return 0;
 }
 
 static int
 testAbout ()
 {
-  struct GNUNET_CONFIGURATION_Handle *cfg;
   char *const myargv[] = {
     "test_getopt",
     "-h",
@@ -124,22 +109,18 @@ testAbout ()
     GNUNET_GETOPT_OPTION_END
   };
 
-  cfg = GNUNET_CONFIGURATION_create ();
   if (-1 != GNUNET_GETOPT_run ("test_getopt",
-                               cfg, aboutoptionlist, 2, myargv))
+                               aboutoptionlist, 2, myargv))
     {
       GNUNET_break (0);
-      GNUNET_CONFIGURATION_destroy (cfg);
       return 1;
     }
-  GNUNET_CONFIGURATION_destroy (cfg);
   return 0;
 }
 
 static int
 testLogOpts ()
 {
-  struct GNUNET_CONFIGURATION_Handle *cfg;
   char *const myargv[] = {
     "test_getopt",
     "-l", "filename",
@@ -154,15 +135,12 @@ testLogOpts ()
     GNUNET_GETOPT_OPTION_END
   };
 
-  cfg = GNUNET_CONFIGURATION_create ();
-  if (5 != GNUNET_GETOPT_run ("test_getopt", cfg, logoptionlist, 5, myargv))
+  if (5 != GNUNET_GETOPT_run ("test_getopt", logoptionlist, 5, myargv))
     {
       GNUNET_break (0);
-      GNUNET_CONFIGURATION_destroy (cfg);
       return 1;
     }
   GNUNET_assert (fn != NULL);
-  GNUNET_CONFIGURATION_destroy (cfg);
   if ((0 != strcmp (level, "WARNING")) || (0 != strcmp (fn, "filename")))
     {
       GNUNET_break (0);
@@ -178,7 +156,6 @@ testLogOpts ()
 static int
 testFlagNum ()
 {
-  struct GNUNET_CONFIGURATION_Handle *cfg;
   char *const myargv[] = {
     "test_getopt",
     "-f",
@@ -199,14 +176,11 @@ testFlagNum ()
     GNUNET_GETOPT_OPTION_END
   };
 
-  cfg = GNUNET_CONFIGURATION_create ();
-  if (6 != GNUNET_GETOPT_run ("test_getopt", cfg, logoptionlist, 6, myargv))
+  if (6 != GNUNET_GETOPT_run ("test_getopt", logoptionlist, 6, myargv))
     {
       GNUNET_break (0);
-      GNUNET_CONFIGURATION_destroy (cfg);
       return 1;
     }
-  GNUNET_CONFIGURATION_destroy (cfg);
   if ((1 != flag) || (42 != num) || (42 != lnum))
     {
       GNUNET_break (0);
diff --git a/src/util/test_program.c b/src/util/test_program.c
index dee602e2a..5c58123b5 100644
--- a/src/util/test_program.c
+++ b/src/util/test_program.c
@@ -41,7 +41,8 @@ static void
 runner (void *cls,
         struct GNUNET_SCHEDULER_Handle *sched,
         char *const *args,
-        const char *cfgfile, struct GNUNET_CONFIGURATION_Handle *cfg)
+        const char *cfgfile, 
+        const struct GNUNET_CONFIGURATION_Handle *cfg)
 {
   int *ok = cls;
   GNUNET_assert (setme == 1);
diff --git a/src/util/test_service.c b/src/util/test_service.c
index 233c23ccf..e8e3f8741 100644
--- a/src/util/test_service.c
+++ b/src/util/test_service.c
@@ -74,7 +74,7 @@ build_msg (void *cls, size_t size, void *buf)
 static void
 ready (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
-  struct GNUNET_CONFIGURATION_Handle *cfg = cls;
+  const struct GNUNET_CONFIGURATION_Handle *cfg = cls;
   struct GNUNET_CLIENT_Connection *client;
 
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Service confirmed running\n");
@@ -108,17 +108,18 @@ static void
 runner (void *cls,
         struct GNUNET_SCHEDULER_Handle *sched,
         struct GNUNET_SERVER_Handle *server,
-        struct GNUNET_CONFIGURATION_Handle *cfg)
+        const struct GNUNET_CONFIGURATION_Handle *cfg)
 {
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Service initializing\n");
   GNUNET_SERVER_add_handlers (server, myhandlers);
   GNUNET_CLIENT_service_test (sched,
                               "test_service",
-                              cfg, GNUNET_TIME_UNIT_SECONDS, &ready, cfg);
+                              cfg, GNUNET_TIME_UNIT_SECONDS, &ready, (void*) cfg);
 }
 
 static void
-term (void *cls, struct GNUNET_CONFIGURATION_Handle *cfg)
+term (void *cls, 
+      const struct GNUNET_CONFIGURATION_Handle *cfg)
 {
   int *ok = cls;
   *ok = 0;
@@ -157,7 +158,7 @@ check ()
 static void
 ready6 (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
-  struct GNUNET_CONFIGURATION_Handle *cfg = cls;
+  const struct GNUNET_CONFIGURATION_Handle *cfg = cls;
   struct GNUNET_CLIENT_Connection *client;
 
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "V6 ready\n");
@@ -176,13 +177,13 @@ static void
 runner6 (void *cls,
          struct GNUNET_SCHEDULER_Handle *sched,
          struct GNUNET_SERVER_Handle *server,
-         struct GNUNET_CONFIGURATION_Handle *cfg)
+         const struct GNUNET_CONFIGURATION_Handle *cfg)
 {
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Initializing v6 service\n");
   GNUNET_SERVER_add_handlers (server, myhandlers);
   GNUNET_CLIENT_service_test (sched,
                               "test_service6",
-                              cfg, GNUNET_TIME_UNIT_SECONDS, &ready6, cfg);
+                              cfg, GNUNET_TIME_UNIT_SECONDS, &ready6, (void*) cfg);
 }
 
 /**
@@ -252,7 +253,8 @@ static void
 start_stop_main (void *cls,
                  struct GNUNET_SCHEDULER_Handle *sched,
                  char *const *args,
-                 const char *cfgfile, struct GNUNET_CONFIGURATION_Handle *cfg)
+                 const char *cfgfile, 
+                 const struct GNUNET_CONFIGURATION_Handle *cfg)
 {
   int *ret = cls;
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,