Project

General

Profile

Feature #539

Use DBG1 for settings.c debug messages

Added by Pavel Šimerda over 11 years ago. Updated over 11 years ago.

Status:
Closed
Priority:
Normal
Assignee:
Tobias Brunner
Category:
libstrongswan
Target version:
5.1.3
Start date:
04.03.2014
Due date:
Estimated time:
Resolution:
Fixed

Description

I found this patch in Fedora and would like to ask you to consider accepting it into upstream. I don't have details on the purpose but I can get them.

diff -urNp strongswan-5.1.1-patched/src/libstrongswan/utils/settings.c strongswan-5.1.1-current/src/libstrongswan/utils/settings.c
--- strongswan-5.1.1-patched/src/libstrongswan/utils/settings.c 2013-11-01 13:12:06.034927154 -0400
+++ strongswan-5.1.1-current/src/libstrongswan/utils/settings.c 2013-11-01 13:18:56.230912491 -0400
@@ -960,7 +960,7 @@ static bool parse_file(linked_list_t *co
        {
                if (errno == ENOENT)
                {
-                       DBG2(DBG_LIB, "'%s' does not exist, ignored", file);
+                       DBG1(DBG_LIB, "'%s' does not exist, ignored", file);
                        return TRUE;
                }
                DBG1(DBG_LIB, "failed to stat '%s': %s", file, strerror(errno));
@@ -1023,7 +1023,7 @@ static bool parse_files(linked_list_t *c

        if (!strlen(pattern))
        {
-               DBG2(DBG_LIB, "empty include pattern, ignored");
+               DBG1(DBG_LIB, "empty include pattern, ignored");
                return TRUE;
        }

@@ -1055,7 +1055,7 @@ static bool parse_files(linked_list_t *c
                status = glob(pat, GLOB_ERR, NULL, &buf);
                if (status == GLOB_NOMATCH)
                {
-                       DBG2(DBG_LIB, "no files found matching '%s', ignored", pat);
+                       DBG1(DBG_LIB, "no files found matching '%s', ignored", pat);
                }
                else if (status != 0)
                {

History

#1 Updated by Tobias Brunner over 11 years ago

  • Tracker changed from Issue to Feature
  • Category set to libstrongswan
  • Status changed from New to Closed
  • Assignee set to Tobias Brunner
  • Target version set to 5.1.3
  • Resolution set to Fixed

Now that we updated the default strongswan.conf and actually use includes it probably makes sense. Some of these were on level 2 because some distributions used to include non-existing files (or patterns) in configuration files (not particularly in strongswan.conf but ipsec.conf and ipsec.secrets).

Applied with the associated commit.