diff options
| author | Eric Leblond <eric@regit.org> | 2013-02-09 20:49:56 +0100 |
|---|---|---|
| committer | Eric Leblond <eric@regit.org> | 2013-02-18 09:30:49 +0100 |
| commit | 1baf694356a64c900d241a069e36529dd65fc679 (patch) | |
| tree | 2ac3114c43c638919d6cad9d2ec2d13ec87d55e9 | |
| parent | b48bc198742b2694793057b9c7712d76ff60f71e (diff) | |
Use access to ensure readability of config gile
This patch adds a call to access to check the readability of the
configuration file.
| -rw-r--r-- | src/conffile.c | 11 | ||||
| -rw-r--r-- | src/ulogd.c | 2 |
2 files changed, 11 insertions, 2 deletions
diff --git a/src/conffile.c b/src/conffile.c index dd0ed8f..616d7a9 100644 --- a/src/conffile.c +++ b/src/conffile.c @@ -16,9 +16,11 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ + #include <ulogd/ulogd.h> #include <ulogd/common.h> #include <ulogd/conffile.h> +#include <unistd.h> /* points to config entry with error */ @@ -89,10 +91,17 @@ static char *get_word(char *line, char *not, char *buf) /* register config file with us */ int config_register_file(const char *file) { - /* FIXME: stat of file */ if (fname) return 1; + if (access(file, R_OK) != 0) { + ulogd_log(ULOGD_ERROR, + "unable to read configfile \"%s\": %s\n", + file, + strerror(errno)); + return 1; + } + pr_debug("%s: registered config file '%s'\n", __func__, file); fname = (char *) malloc(strlen(file)+1); diff --git a/src/ulogd.c b/src/ulogd.c index c7617d9..f8c8ed0 100644 --- a/src/ulogd.c +++ b/src/ulogd.c @@ -1216,7 +1216,7 @@ int main(int argc, char* argv[]) /* parse config file */ if (parse_conffile("global", &ulogd_kset)) { - ulogd_log(ULOGD_FATAL, "parse_conffile\n"); + ulogd_log(ULOGD_FATAL, "unable to parse config file\n"); warn_and_exit(daemonize); } |