summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthias Schiffer <mschiffer@universe-factory.net>2013-08-07 20:26:52 +0200
committerMatthias Schiffer <mschiffer@universe-factory.net>2013-08-07 20:26:52 +0200
commitdfac85a4ced46f83738c84b52719ded503e349e7 (patch)
tree5620cbf7cadc623fbff29023afdd65713ab2faf9
parent86e480042887f18f0ac2a73a49da33b5625cf9b3 (diff)
downloadfastd-dfac85a4ced46f83738c84b52719ded503e349e7.tar
fastd-dfac85a4ced46f83738c84b52719ded503e349e7.zip
Fix segfault on --generate-key
-rw-r--r--src/config.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/config.c b/src/config.c
index 3ee5a76..8ad4f72 100644
--- a/src/config.c
+++ b/src/config.c
@@ -604,6 +604,8 @@ void fastd_configure(fastd_context_t *ctx, fastd_config_t *conf, int argc, char
if (!conf->methods[0])
conf->methods[0] = conf->method_default;
+ ctx->conf = conf;
+
if (conf->generate_key || conf->show_key)
return;
@@ -625,8 +627,6 @@ void fastd_configure(fastd_context_t *ctx, fastd_config_t *conf, int argc, char
#endif
configure_user(ctx, conf);
-
- ctx->conf = conf;
configure_method_parameters(ctx, conf);
}