From cbf0166a7f12f71747c495b5ea68ff676c1a7868 Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Tue, 3 Apr 2012 23:07:55 +0200 Subject: Save absolute path in peer configs from peer dirs --- src/config.c | 2 +- src/peer.c | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/src/config.c b/src/config.c index aa10b10..c708609 100644 --- a/src/config.c +++ b/src/config.c @@ -137,7 +137,7 @@ void fastd_read_config_dir(fastd_context *ctx, fastd_config *conf, const char *d fastd_peer_config_new(ctx, conf); conf->peers->name = strdup(result->d_name); - conf->peers->config_source_dir = strdup(dir); + conf->peers->config_source_dir = conf->peer_dirs->str; if (!fastd_read_config(ctx, conf, result->d_name, true, depth)) { pr_warn(ctx, "peer config `%s' will be ignored", result->d_name); diff --git a/src/peer.c b/src/peer.c index 415358e..1a418e8 100644 --- a/src/peer.c +++ b/src/peer.c @@ -98,7 +98,6 @@ fastd_peer_config* fastd_peer_config_new(fastd_context *ctx, fastd_config *conf) void fastd_peer_config_delete(fastd_context *ctx, fastd_config *conf) { fastd_peer_config *peer = conf->peers, *next = peer->next; - free(peer->config_source_dir); free(peer->name); free(peer->key); free(peer); -- cgit v1.2.3