re allow - in vnames since it seems to have worked for some in 1.4

diff --git a/doc/rrdgraph_data.pod b/doc/rrdgraph_data.pod
index 3424bc237a1bba43963ffccdd29be2d8cc64881b..4d5642c70851752a12bf4fdefbe47cf5ac919ef9 100644 (file)
--- a/doc/rrdgraph_data.pod
+++ b/doc/rrdgraph_data.pod
@@ -20,7 +20,7 @@ instructions use a language called B<RPN> which is described in its
 own manual page.
 
 Variable names (I<vname>) must be made up strings of the following characters
-C<A-Z, a-z, 0-9, _> and a maximum length of 255 characters.
+C<A-Z, a-z, 0-9, _, -> and a maximum length of 255 characters.
 
 When picking variable names, make sure you do not choose a name that is
 already taken by an RPN operator. A safe bet it to use lowercase or

diff --git a/src/rrd_rpncalc.h b/src/rrd_rpncalc.h
index 98317c3f95c87b344c281453612897776929960c..cdadf4d728ab054d42cfa9277d1b0524d843ab5f 100644 (file)
--- a/src/rrd_rpncalc.h
+++ b/src/rrd_rpncalc.h
@@ -48,7 +48,7 @@ typedef struct rpn_cdefds_t {
 } rpn_cdefds_t;
 
 #define MAX_VNAME_LEN 255
-#define DEF_NAM_FMT "%255[_A-Za-z0-9]"
+#define DEF_NAM_FMT "%255[_A-Za-z0-9-]"
 
 /* limit imposed by sizeof(rpn_cdefs_t) and rrd.ds_def.par */
 #define DS_CDEF_MAX_RPN_NODES (int)(sizeof(unival)*10 / sizeof(rpn_cdefds_t))