diff options
Diffstat (limited to 'src/util/program.c')
-rw-r--r-- | src/util/program.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/src/util/program.c b/src/util/program.c index 930b93422..a8724c4ee 100644 --- a/src/util/program.c +++ b/src/util/program.c | |||
@@ -259,21 +259,24 @@ GNUNET_PROGRAM_run2 (int argc, char *const *argv, const char *binaryName, | |||
259 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, | 259 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, |
260 | _("Malformed configuration file `%s', exit ...\n"), | 260 | _("Malformed configuration file `%s', exit ...\n"), |
261 | cc.cfgfile); | 261 | cc.cfgfile); |
262 | GNUNET_free (cc.cfgfile); | ||
262 | return GNUNET_SYSERR; | 263 | return GNUNET_SYSERR; |
263 | } | 264 | } |
264 | } | 265 | } |
265 | else | 266 | else |
266 | { | 267 | { |
268 | if (0 != strcmp (cc.cfgfile, cfg_fn)) | ||
269 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, | ||
270 | _("Could not access configuration file `%s'\n"), | ||
271 | cc.cfgfile); | ||
272 | GNUNET_free (cc.cfgfile); | ||
273 | cc.cfgfile = NULL; | ||
267 | if (GNUNET_SYSERR == GNUNET_CONFIGURATION_load (cfg, NULL)) | 274 | if (GNUNET_SYSERR == GNUNET_CONFIGURATION_load (cfg, NULL)) |
268 | { | 275 | { |
269 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, | 276 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, |
270 | _("Malformed configuration, exit ...\n")); | 277 | _("Malformed configuration, exit ...\n")); |
271 | return GNUNET_SYSERR; | 278 | return GNUNET_SYSERR; |
272 | } | 279 | } |
273 | if (0 != strcmp (cc.cfgfile, cfg_fn)) | ||
274 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, | ||
275 | _("Could not access configuration file `%s'\n"), | ||
276 | cc.cfgfile); | ||
277 | } | 280 | } |
278 | GNUNET_free (allopts); | 281 | GNUNET_free (allopts); |
279 | GNUNET_free (lpfx); | 282 | GNUNET_free (lpfx); |