From dfac85a4ced46f83738c84b52719ded503e349e7 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Wed, 7 Aug 2013 20:26:52 +0200
Subject: Fix segfault on --generate-key

---
 src/config.c | 4 ++--
 1 file 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);
 }
 
-- 
cgit v1.2.3