diff options
| author | Günther Deschner <gdeschner@redhat.com> | 2013-06-03 12:38:39 +0200 |
|---|---|---|
| committer | Günther Deschner <gdeschner@redhat.com> | 2013-06-06 16:52:10 +0200 |
| commit | 88a3f308ab8008f49ec8a517d771f9c9ab49800d (patch) | |
| tree | bdca9bb47f1c9ac9d64d0c8849d40683a7d5ec73 | |
| parent | d8b62de102ba91989563164f7717457e4aa07a06 (diff) | |
| download | gss-proxy-88a3f308ab8008f49ec8a517d771f9c9ab49800d.tar.gz gss-proxy-88a3f308ab8008f49ec8a517d771f9c9ab49800d.tar.xz gss-proxy-88a3f308ab8008f49ec8a517d771f9c9ab49800d.zip | |
Use GPERROR when config parsing fails.
This makes it more likely configuration parsing failures are detected.
Signed-off-by: Günther Deschner <gdeschner@redhat.com>
| -rw-r--r-- | proxy/src/gp_config.c | 6 | ||||
| -rw-r--r-- | proxy/src/gp_config_dinglibs.c | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/proxy/src/gp_config.c b/proxy/src/gp_config.c index 1b676d3..2fd9c26 100644 --- a/proxy/src/gp_config.c +++ b/proxy/src/gp_config.c @@ -278,7 +278,7 @@ static int gp_init_ini_context(const char *config_file, ctx = calloc(1, sizeof(struct gp_ini_context)); if (!ctx) { - return ENOENT; + return ENOMEM; } ret = gp_config_init(config_file, ctx); @@ -321,7 +321,7 @@ int load_config(struct gp_config *cfg) done: if (ret != 0) { - GPERROR("Error reading configuration %d: %s", ret, strerror(ret)); + GPERROR("Error reading configuration %d: %s\n", ret, strerror(ret)); } gp_config_close(ctx); safefree(ctx); @@ -371,7 +371,7 @@ struct gp_config *read_config(char *config_file, int opt_daemonize) ret = load_config(cfg); if (ret) { - GPDEBUG("Config file not found!\n"); + GPERROR("Failed to load configuration!\n"); } done: diff --git a/proxy/src/gp_config_dinglibs.c b/proxy/src/gp_config_dinglibs.c index 8716b91..776945e 100644 --- a/proxy/src/gp_config_dinglibs.c +++ b/proxy/src/gp_config_dinglibs.c @@ -237,7 +237,7 @@ int gp_dinglibs_init(const char *config_file, 0, /* metadata_flags, FIXME */ &file_ctx); if (ret) { - GPDEBUG("Failed to open config file: %d (%s)\n", + GPERROR("Failed to open config file: %d (%s)\n", ret, strerror(ret)); ini_config_destroy(ini_config); return ret; @@ -254,7 +254,7 @@ int gp_dinglibs_init(const char *config_file, if (ret) { char **errors = NULL; /* we had a parsing failure */ - GPDEBUG("Failed to parse config file: %d (%s)\n", + GPERROR("Failed to parse config file: %d (%s)\n", ret, strerror(ret)); if (ini_config_error_count(ini_config)) { ini_config_get_errors(ini_config, &errors); |