X-Git-Url: https://git.octo.it/?p=rrdtool.git;a=blobdiff_plain;f=src%2Frrd_client.c;fp=src%2Frrd_client.c;h=b3294f4acf88fd6680c5677707cc99721ccd5900;hp=b895237c52410598f0f03b1b77b8143fa0879663;hb=f793cbd1791e68c0c12f0a579fda160747095ecc;hpb=9584450afaaba1686d2b27b6436743339737a789 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) /* {{{ */