From f793cbd1791e68c0c12f0a579fda160747095ecc Mon Sep 17 00:00:00 2001 From: oetiker Date: Fri, 28 May 2010 04:55:14 +0000 Subject: [PATCH] [rrd_client.c] RRD client should resolve all paths when talking to a unix socket. This allows realpath() to resolve symbolic links, "..", etc. reported by: Eduardo Bragatto -- kevin brintnall git-svn-id: svn://svn.oetiker.ch/rrdtool/trunk/program@2083 a5681a0c-68f1-0310-ab6d-d61299d08faa --- src/rrd_client.c | 26 ++++++++++++-------------- 1 file changed, 12 insertions(+), 14 deletions(-) diff --git a/src/rrd_client.c b/src/rrd_client.c index b895237..b3294f4 100644 --- a/src/rrd_client.c +++ b/src/rrd_client.c @@ -77,26 +77,24 @@ static const char *get_path (const char *path, char *resolved_path) /* {{{ */ || (strncmp ("unix:", sd_path, strlen ("unix:")) == 0)) is_unix = 1; - if (*path == '/') /* absolute path */ + if (is_unix) { - if (! is_unix) - { - rrd_set_error ("absolute path names not allowed when talking " - "to a remote daemon"); - return (NULL); - } - /* else: nothing to do */ + ret = realpath(path, resolved_path); + if (ret == NULL) + rrd_set_error("realpath(%s): %s", path, rrd_strerror(errno)); + return ret; } - else /* relative path */ + else { - if (is_unix) + if (*path == '/') /* not absolute path */ { - realpath (path, resolved_path); - ret = resolved_path; + rrd_set_error ("absolute path names not allowed when talking " + "to a remote daemon"); + return NULL; } - /* else: nothing to do */ } - return (ret); + + return path; } /* }}} char *get_path */ static size_t strsplit (char *string, char **fields, size_t size) /* {{{ */ -- 2.11.0