Two configuration attributes for SG objects were not handled

correctly by the config parser. 


git-svn-id: http://svn.fedorahosted.org/svn/corosync/trunk@1249 fd59a12c-fef9-0310-b244-a6a79926bd2f

exec/amfsg.c

@@ -1502,6 +1502,7 @@ struct amf_sg *amf_sg_new (struct amf_application *app, char *name)
 	sg->saAmfSGNumPrefActiveSUs = 1;
 	sg->saAmfSGNumPrefStandbySUs = 1;
 	sg->saAmfSGNumPrefInserviceSUs = ~0;
+	sg->saAmfSGNumPrefAssignedSUs = ~0;
 	sg->saAmfSGCompRestartProb = -1;
 	sg->saAmfSGCompRestartMax = ~0;
 	sg->saAmfSGSuRestartProb = -1;

exec/amfutil.c

@@ -463,6 +463,10 @@ struct amf_cluster *amf_config_read (char **error_string)
 				sg->saAmfSGNumPrefActiveSUs = atoi (loc);
 			} else if ((loc = strstr_rs (line, "saAmfSGNumPrefStandbySUs=")) != 0) {
 				sg->saAmfSGNumPrefStandbySUs = atoi (loc);
+			} else if ((loc = strstr_rs (line, "saAmfSGNumPrefInserviceSUs=")) != 0) {
+				sg->saAmfSGNumPrefInserviceSUs = atoi (loc);
+			} else if ((loc = strstr_rs (line, "saAmfSGNumPrefAssignedSUs=")) != 0) {
+				sg->saAmfSGNumPrefAssignedSUs = atoi (loc);
 			} else if ((loc = strstr_rs (line, "saAmfSGMaxActiveSIsperSUs=")) != 0) {
 				sg->saAmfSGMaxActiveSIsperSUs = atoi (loc);
 			} else if ((loc = strstr_rs (line, "saAmfSGMaxStandbySIsperSUs=")) != 0) {
@@ -515,6 +519,10 @@ struct amf_cluster *amf_config_read (char **error_string)
 				if (sg->saAmfSGNumPrefInserviceSUs == ~0) {
 					sg->saAmfSGNumPrefInserviceSUs = su_cnt;
 				}
+				if (sg->saAmfSGNumPrefAssignedSUs == ~0) {
+					sg->saAmfSGNumPrefAssignedSUs =
+						sg->saAmfSGNumPrefInserviceSUs;
+				}
 				current_parse = AMF_APPLICATION;
 			} else {
 				goto parse_error;