diff options
| author | Martin Willi <martin@revosec.ch> | 2011-04-21 13:21:26 +0200 |
|---|---|---|
| committer | Martin Willi <martin@revosec.ch> | 2011-04-21 13:35:31 +0200 |
| commit | 5b0bcfb1fc4aabb6535db91e70f7f262328e664f (patch) | |
| tree | 000c5588b5da0e498f74e251cd0e1aeaa6d597a9 /src/libhydra | |
| parent | fdead26ffe1da8501a6ff5e0639a6f44c723e763 (diff) | |
| download | strongswan-5b0bcfb1fc4aabb6535db91e70f7f262328e664f.tar.bz2 strongswan-5b0bcfb1fc4aabb6535db91e70f7f262328e664f.tar.xz | |
Revert alloc_str changes
This reverts commit fdead26ffe1da8501a6ff5e0639a6f44c723e763.
This reverts commit 3e2419ebe32de72d824864eb2e0e677a7c197af1.
This reverts commit 17ce69b47a1efd6234960cf7d1f50712aee61db5.
Diffstat (limited to 'src/libhydra')
| -rw-r--r-- | src/libhydra/plugins/attr/attr_provider.c | 5 | ||||
| -rw-r--r-- | src/libhydra/plugins/resolve/resolve_handler.c | 3 |
2 files changed, 3 insertions, 5 deletions
diff --git a/src/libhydra/plugins/attr/attr_provider.c b/src/libhydra/plugins/attr/attr_provider.c index 2dd67cb72..44242c259 100644 --- a/src/libhydra/plugins/attr/attr_provider.c +++ b/src/libhydra/plugins/attr/attr_provider.c @@ -109,8 +109,8 @@ static void add_legacy_entry(private_attr_provider_t *this, char *key, int nr, host_t *host; char *str; - str = lib->settings->alloc_str(lib->settings, "%s.%s%d", NULL, - hydra->daemon, key, nr); + str = lib->settings->get_str(lib->settings, "%s.%s%d", NULL, hydra->daemon, + key, nr); if (str) { host = host_create_from_string(str, 0); @@ -139,7 +139,6 @@ static void add_legacy_entry(private_attr_provider_t *this, char *key, int nr, configuration_attribute_type_names, entry->type, &entry->value); this->attributes->insert_last(this->attributes, entry); } - free(str); } } diff --git a/src/libhydra/plugins/resolve/resolve_handler.c b/src/libhydra/plugins/resolve/resolve_handler.c index d16fec962..feb2fd05a 100644 --- a/src/libhydra/plugins/resolve/resolve_handler.c +++ b/src/libhydra/plugins/resolve/resolve_handler.c @@ -228,7 +228,6 @@ static enumerator_t* create_attribute_enumerator(private_resolve_handler_t *this static void destroy(private_resolve_handler_t *this) { this->mutex->destroy(this->mutex); - free(this->file); free(this); } @@ -245,7 +244,7 @@ resolve_handler_t *resolve_handler_create() this->public.destroy = (void(*)(resolve_handler_t*))destroy; this->mutex = mutex_create(MUTEX_TYPE_DEFAULT); - this->file = lib->settings->alloc_str(lib->settings, + this->file = lib->settings->get_str(lib->settings, "%s.plugins.resolve.file", RESOLV_CONF, hydra->daemon); return &this->public; |