From: Eric Leblond <eric@regit.org>
To: netfilter-devel@vger.kernel.org
Cc: eric@regit.org
Subject: [PATCH 3/7] Use access to ensure readability of config gile
Date: Mon, 18 Feb 2013 09:37:44 +0100 [thread overview]
Message-ID: <1361176668-22661-4-git-send-email-eric@regit.org> (raw)
In-Reply-To: <1361176668-22661-1-git-send-email-eric@regit.org>
This patch adds a call to access to check the readability of the
configuration file.
Signed-off-by: Eric Leblond <eric@regit.org>
---
src/conffile.c | 11 ++++++++++-
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);
}
--
1.7.10.4
next prev parent reply other threads:[~2013-02-18 8:38 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-02-18 8:37 [ulogd patch] small code cleaning Eric Leblond
2013-02-18 8:37 ` [PATCH 1/7] Update TODO Eric Leblond
2013-02-18 8:37 ` [PATCH 2/7] Suppress dead FIXME Eric Leblond
2013-02-18 8:37 ` Eric Leblond [this message]
2013-02-18 8:37 ` [PATCH 4/7] Fix typo in comments Eric Leblond
2013-02-18 8:37 ` [PATCH 5/7] Add handling of too long arguments Eric Leblond
2013-02-18 9:41 ` Mr Dash Four
2013-02-18 15:04 ` Eric Leblond
2013-02-18 8:37 ` [PATCH 6/7] logemu: return error if configuration is invalid Eric Leblond
2013-02-18 8:37 ` [PATCH 7/7] conf: error handling for too long line Eric Leblond
2013-02-18 9:41 ` Mr Dash Four
2013-02-22 10:18 ` [ulogd patch] small code cleaning Eric Leblond
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1361176668-22661-4-git-send-email-eric@regit.org \
--to=eric@regit.org \
--cc=netfilter-devel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).