This is an automated email from the git hooks/post-receive script.
rharwood pushed a commit to branch master
in repository gssproxy.
commit df434333de34a13440857b511a4c60fbc6a71a5c
Author: Robbie Harwood <rharwood(a)redhat.com>
Date: Tue May 16 14:16:23 2017 -0400
Fix segfault when no config files are present
Resolves: rhbz#1451255
Signed-off-by: Robbie Harwood <rharwood(a)redhat.com>
Reviewed-by: Simo Sorce <simo(a)redhat.com>
Merges: #185
---
proxy/src/gp_config.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/proxy/src/gp_config.c b/proxy/src/gp_config.c
index 1d2bf7d..31c5681 100644
--- a/proxy/src/gp_config.c
+++ b/proxy/src/gp_config.c
@@ -845,16 +845,17 @@ int gp_config_init(const char *config_file, const char *config_dir,
if (config_file) {
ret = gp_config_from_file(config_file, ini_config, collision_flags);
- if (ret == ENOENT) {
- GPDEBUG("Expected config file %s but did not find it.\n",
+ if (ret) {
+ GPDEBUG("Error when trying to read config file %s.\n",
config_file);
- } else if (ret) {
return ret;
}
}
if (config_dir) {
ret = gp_config_from_dir(config_dir, &ini_config, collision_flags);
if (ret) {
+ GPDEBUG("Error when trying to read config directory %s.\n",
+ config_dir);
return ret;
}
}
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.