[Spread-cvs] commit: r871 - trunk/daemon

[jschultz at spread.org]

Author: jschultz
Date: 2016-11-22 14:54:41 -0500 (Tue, 22 Nov 2016)
New Revision: 871

Modified:
   trunk/daemon/config_parse.y
Log:
Change configuration hash to not consider the minor version for configuration compatability purposes.


Modified: trunk/daemon/config_parse.y
===================================================================
--- trunk/daemon/config_parse.y	2016-11-22 19:53:10 UTC (rev 870)
+++ trunk/daemon/config_parse.y	2016-11-22 19:54:41 UTC (rev 871)
@@ -289,8 +289,8 @@
   char *c = segstr;
   char *e = segstr + segstr_size;
 
-  c += snprintf(segstr, SPCLAMP(c, e), "Version: %d.%d\nProtocol: %s\n",
-                SP_MAJOR_VERSION, SP_MINOR_VERSION, (Conf_get_accelerated_ring() ? "Accelerated Ring" : "Original Ring"));
+  c += snprintf(segstr, SPCLAMP(c, e), "Version: %d\nProtocol: %s\n",
+                SP_MAJOR_VERSION, (Conf_get_accelerated_ring() ? "Accelerated Ring" : "Original Ring"));
   
   Alarmp(SPLOG_DEBUG, CONF_SYS, "config_parse.y:convert_version_to_string: The version string is %d characters long:\n'%s'\n", (int) (c - segstr), segstr);
   
@@ -564,7 +564,7 @@
                             ipver = AF_INET6;
                           
                           else
-                            yyerror("Invalid Active IP Version specified. Must be 'IPv4' or 'IPv6'");
+                            yyerror("Invalid ActiveIPVersion specified.  Value must be 'IPv4' or 'IPv6'");
                           
                           Alarmp(SPLOG_INFO, CONF_SYS, "Setting active IP version to %d\n", ipver);