[gnunet] branch master updated: -config: allow empty config for @inline-secret@

[gnunet]

This is an automated email from the git hooks/post-receive script.

dold pushed a commit to branch master
in repository gnunet.

The following commit(s) were added to refs/heads/master by this push:
     new 0ba0680c8 -config: allow empty config for @inline-secret@
0ba0680c8 is described below

commit 0ba0680c89ecfaf065187bde52733b3672a5ce9e
Author: Florian Dold <florian@dold.me>
AuthorDate: Sat Jul 31 20:03:44 2021 +0200

    -config: allow empty config for @inline-secret@
---
 src/util/configuration.c | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/util/configuration.c b/src/util/configuration.c
index f7277b3cb..93bc03189 100644
--- a/src/util/configuration.c
+++ b/src/util/configuration.c
@@ -589,11 +589,15 @@ handle_inline (struct GNUNET_CONFIGURATION_Handle *cfg,
     cs = find_section (other_cfg, restrict_section);
     if (NULL == cs)
     {
-      LOG (GNUNET_ERROR_TYPE_ERROR,
-           "inlined configuration '%s' does not contain section '%s'\n",
+      LOG (GNUNET_ERROR_TYPE_INFO,
+           "Configuration file '%s' loaded with @inline-secret@ "
+           "does not contain section '%s'.\n",
            inline_path,
            restrict_section);
-      fun_ret = GNUNET_SYSERR;
+      /* Inlined onfiguration is accessible but doesn't contain any values.
+         We treat this as if the inlined section was empty, and do not
+         consider it an error. */
+      fun_ret = GNUNET_OK;
       goto cleanup;
     }
     for (struct ConfigEntry *ce = cs->entries;
@@ -616,7 +620,7 @@ handle_inline (struct GNUNET_CONFIGURATION_Handle *cfg,
   {
     fun_ret = GNUNET_OK;
   }
-  cleanup:
+ cleanup:
   cfg->current_nest_level = old_nest_level;
   if (NULL != other_cfg)
     GNUNET_CONFIGURATION_destroy (other_cfg);
@@ -2310,7 +2314,7 @@ GNUNET_CONFIGURATION_load_from (struct 
GNUNET_CONFIGURATION_Handle *cfg,
     if (fun_ret != GNUNET_OK)
       break;
   }
-  cleanup:
+ cleanup:
   if (files_context.files_length > 0)
   {
     for (size_t i = 0; i < files_context.files_length; i++)

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.