aboutsummaryrefslogtreecommitdiff
path: root/src/util/program.c
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2018-12-11 10:21:39 +0100
committerChristian Grothoff <christian@grothoff.org>2018-12-11 10:21:39 +0100
commitee10b40c55c154400bbefd13175bd8b280cb7798 (patch)
treed475fcde922f4a5e413fb4b76c8784eb48fe71d3 /src/util/program.c
parent70ae2bd54ee0ff610d95a63856f38395920b804d (diff)
downloadgnunet-ee10b40c55c154400bbefd13175bd8b280cb7798.tar.gz
gnunet-ee10b40c55c154400bbefd13175bd8b280cb7798.zip
fail hard if configuration file specified via -c does not exist (in all services and programs)
Diffstat (limited to 'src/util/program.c')
-rw-r--r--src/util/program.c9
1 files changed, 2 insertions, 7 deletions
diff --git a/src/util/program.c b/src/util/program.c
index 2a9b4fac9..da58348d0 100644
--- a/src/util/program.c
+++ b/src/util/program.c
@@ -11,7 +11,7 @@
11 WITHOUT ANY WARRANTY; without even the implied warranty of 11 WITHOUT ANY WARRANTY; without even the implied warranty of
12 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPROSE. See the GNU 12 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPROSE. See the GNU
13 Affero General Public License for more details. 13 Affero General Public License for more details.
14 14
15 You should have received a copy of the GNU Affero General Public License 15 You should have received a copy of the GNU Affero General Public License
16 along with this program. If not, see <http://www.gnu.org/licenses/>. 16 along with this program. If not, see <http://www.gnu.org/licenses/>.
17*/ 17*/
@@ -286,15 +286,10 @@ GNUNET_PROGRAM_run2 (int argc,
286 { 286 {
287 if (0 != strcmp (cc.cfgfile, 287 if (0 != strcmp (cc.cfgfile,
288 cfg_fn)) 288 cfg_fn))
289 {
289 GNUNET_log (GNUNET_ERROR_TYPE_ERROR, 290 GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
290 _("Could not access configuration file `%s'\n"), 291 _("Could not access configuration file `%s'\n"),
291 cc.cfgfile); 292 cc.cfgfile);
292 if (GNUNET_SYSERR ==
293 GNUNET_CONFIGURATION_load (cfg,
294 NULL))
295 {
296 GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
297 _("Malformed configuration, exit ...\n"));
298 ret = GNUNET_SYSERR; 293 ret = GNUNET_SYSERR;
299 GNUNET_free (allopts); 294 GNUNET_free (allopts);
300 GNUNET_free (lpfx); 295 GNUNET_free (lpfx);