Author: jfrederic.clere(a)jboss.com
Date: 2008-10-13 09:01:38 -0400 (Mon, 13 Oct 2008)
New Revision: 1954
Modified:
trunk/mod_cluster/native/mod_manager/mod_manager.c
Log:
Don't allow command with missing JVMRoute.
Modified: trunk/mod_cluster/native/mod_manager/mod_manager.c
===================================================================
--- trunk/mod_cluster/native/mod_manager/mod_manager.c 2008-10-13 12:08:37 UTC (rev 1953)
+++ trunk/mod_cluster/native/mod_manager/mod_manager.c 2008-10-13 13:01:38 UTC (rev 1954)
@@ -59,6 +59,7 @@
#define SBALBIG "SYNTAX: Balancer field too big"
#define SBAFBIG "SYNTAX: A field is too big"
#define SROUBIG "SYNTAX: JVMRoute field too big"
+#define SROUBAD "SYNTAX: JVMRoute can't be empty"
#define SDOMBIG "SYNTAX: Domain field too big"
#define SHOSBIG "SYNTAX: Host field too big"
#define SPORBIG "SYNTAX: Port field too big"
@@ -674,6 +675,13 @@
i++;
i++;
}
+
+ /* Check for JVMRoute */
+ if (nodeinfo.mess.JVMRoute[0] == '\0') {
+ *errtype = TYPESYNTAX;
+ return SROUBAD;
+ }
+
/* Insert or update balancer description */
if (insert_update_balancer(balancerstatsmem, &balancerinfo) != APR_SUCCESS) {
*errtype = TYPEMEM;
@@ -869,6 +877,7 @@
return SMESPAR;
}
+ memset(&nodeinfo.mess, '\0', sizeof(nodeinfo.mess));
/* Map nothing by default */
vhost = apr_palloc(r->pool, sizeof(struct cluster_host));
vhost->host = NULL;
@@ -902,6 +911,12 @@
i++;
}
+ /* Check for JVMRoute */
+ if (nodeinfo.mess.JVMRoute[0] == '\0') {
+ *errtype = TYPESYNTAX;
+ return SROUBAD;
+ }
+
/* Read the node */
node = read_node(nodestatsmem, &nodeinfo);
if (node == NULL) {
Show replies by date