denozord/strongswan-ext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use daemon-specific config for the attr plugin.

Browse Source
This commit is contained in:
Tobias Brunner
2010-04-06 12:47:40 +02:00
parent a5ec302547
commit 7ac6060e8d
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libhydra/plugins/attr/attr_provider.c
+9 -5
View File
@@ -1,4 +1,5 @@
/* /*
* Copyright (C) 2010 Tobias Brunner
* Copyright (C) 2009 Martin Willi * Copyright (C) 2009 Martin Willi
* Hochschule fuer Technik Rapperswil * Hochschule fuer Technik Rapperswil
* *
@@ -17,7 +18,9 @@
#include <time.h> #include <time.h>
#include <daemon.h> #include <hydra.h>
#include <debug.h>
#include <utils/linked_list.h>
#define SERVER_MAX 2 #define SERVER_MAX 2
@@ -100,7 +103,8 @@ static void add_legacy_entry(private_attr_provider_t *this, char *key, int nr,
host_t *host; host_t *host;
char *str; char *str;
str = lib->settings->get_str(lib->settings, "charon.%s%d", NULL, key, nr); str = lib->settings->get_str(lib->settings, "%s.%s%d", NULL, hydra->daemon,
key, nr);
if (str) if (str)
{ {
host = host_create_from_string(str, 0); host = host_create_from_string(str, 0);
@@ -155,7 +159,7 @@ static void load_entries(private_attr_provider_t *this)
char *key, *value, *token; char *key, *value, *token;
enumerator = lib->settings->create_key_value_enumerator(lib->settings, enumerator = lib->settings->create_key_value_enumerator(lib->settings,
"charon.plugins.attr"); "%s.plugins.attr", hydra->daemon);
while (enumerator->enumerate(enumerator, &key, &value)) while (enumerator->enumerate(enumerator, &key, &value))
{ {
configuration_attribute_type_t type; configuration_attribute_type_t type;
@@ -170,7 +174,7 @@ static void load_entries(private_attr_provider_t *this)
host = host_create_from_string(token, 0); host = host_create_from_string(token, 0);
if (!host) if (!host)
{ {
DBG1(DBG_CFG, "invalid host in key %s: %s", key, token); DBG1("invalid host in key %s: %s", key, token);
continue; continue;
} }
if (!type) if (!type)
@@ -191,7 +195,7 @@ static void load_entries(private_attr_provider_t *this)
} }
if (!type) if (!type)
{ {
DBG1(DBG_CFG, "mapping attribute type %s failed", key); DBG1("mapping attribute type %s failed", key);
break; break;
} }
} }