lib-sieve: spamtest/virustest extension: Rename settings to better match Dovecot conventions

src/lib-sieve/plugins/spamvirustest/ext-spamvirustest-common.c

@@ -36,7 +36,7 @@ struct ext_spamvirustest_context {
 	const struct ext_spamvirustest_settings *set;
 
 	struct ext_spamvirustest_header_spec status_header;
-	struct ext_spamvirustest_header_spec max_header;
+	struct ext_spamvirustest_header_spec score_max_header;
 };
 
 /*
@@ -227,14 +227,14 @@ int ext_spamvirustest_load(const struct sieve_extension *ext, void **context_r)
 
 	if (ret == 0 &&
 	    set->parsed.status_type != EXT_SPAMVIRUSTEST_STATUS_TYPE_TEXT &&
-	    *set->max_header != '\0' &&
+	    *set->score_max_header != '\0' &&
 	    !ext_spamvirustest_header_spec_parse(extctx->pool,
-						 set->max_header,
-						 &extctx->max_header,
+						 set->score_max_header,
+						 &extctx->score_max_header,
 						 &error)) {
 		e_error(svinst->event, "%s: "
-			"Invalid max header specification '%s': %s",
-			sieve_extension_name(ext), set->max_header, error);
+			"Invalid max score header specification '%s': %s",
+			sieve_extension_name(ext), set->score_max_header, error);
 		ret = -1;
 	}
 
@@ -259,7 +259,7 @@ void ext_spamvirustest_unload(const struct sieve_extension *ext)
 		return;
 
 	ext_spamvirustest_header_spec_free(&extctx->status_header);
-	ext_spamvirustest_header_spec_free(&extctx->max_header);
+	ext_spamvirustest_header_spec_free(&extctx->score_max_header);
 	settings_free(extctx->set);
 	pool_unref(&extctx->pool);
 }
@@ -351,7 +351,7 @@ int ext_spamvirustest_get_value(const struct sieve_runtime_env *renv,
 
 	mail = sieve_message_get_mail(renv->msgctx);
 	status_header = &extctx->status_header;
-	max_header = &extctx->max_header;
+	max_header = &extctx->score_max_header;
 
 	if (extctx->set->parsed.status_type != EXT_SPAMVIRUSTEST_STATUS_TYPE_TEXT) {
 		if (max_header->header_name != NULL) {
@@ -379,7 +379,7 @@ int ext_spamvirustest_get_value(const struct sieve_runtime_env *renv,
 					    2, match_values, 0) != 0 ) {
 					sieve_runtime_trace(
 						renv, SIEVE_TRLVL_TESTS,
-						"max_header regexp for header '%s' did not match "
+						"score_max_header regexp for header '%s' did not match "
 						"on value '%s'",
 						max_header->header_name,
 						header_value);
@@ -409,7 +409,7 @@ int ext_spamvirustest_get_value(const struct sieve_runtime_env *renv,
 				goto failed;
 			}
 		} else {
-			max_value = extctx->set->parsed.max_value;
+			max_value = extctx->set->parsed.score_max_value;
 		}
 
 		if (max_value == 0) {

src/lib-sieve/plugins/spamvirustest/ext-spamvirustest-settings.c

@@ -24,8 +24,8 @@ static const struct setting_define ext_spamtest_setting_defines[] = {
 	DEF(STR, status_header),
 	DEF(STR, status_type),
 
-	DEF(STR, max_header),
-	DEF(STR, max_value),
+	DEF(STR, score_max_header),
+	DEF(STR, score_max_value),
 
 	{ .type = SET_STRLIST, .key = "sieve_spamtest_text_value",
 	  .offset = offsetof(struct ext_spamvirustest_settings,
@@ -43,8 +43,8 @@ static const struct setting_define ext_virustest_setting_defines[] = {
 	DEF(STR, status_header),
 	DEF(STR, status_type),
 
-	DEF(STR, max_header),
-	DEF(STR, max_value),
+	DEF(STR, score_max_header),
+	DEF(STR, score_max_value),
 
 	{ .type = SET_STRLIST, .key = "sieve_virustest_text_value",
 	  .offset = offsetof(struct ext_spamvirustest_settings,
@@ -57,8 +57,8 @@ static const struct ext_spamvirustest_settings ext_spamvirustest_default_setting
 	.status_header = "",
 	.status_type = "",
 
-	.max_header = "",
-	.max_value = "",
+	.score_max_header = "",
+	.score_max_value = "",
 
 	.text_value = ARRAY_INIT,
 };
@@ -176,25 +176,29 @@ ext_spamvirustest_settings_check(void *_set, bool virustest,
 	}
 
 	if (set->parsed.status_type != EXT_SPAMVIRUSTEST_STATUS_TYPE_TEXT) {
-		if (*set->max_header != '\0' && *set->max_value != '\0') {
+		if (*set->score_max_header != '\0' &&
+		    *set->score_max_value != '\0') {
 			*error_r = t_strdup_printf(
-				"sieve_%s_max_header and sieve_%s_max_value "
+				"sieve_%s_score_max_header and sieve_%s_score_max_value "
 				"cannot both be configured",
 				ext_name, ext_name);
 			return FALSE;
 		}
-		if (*set->max_header == '\0' && *set->max_value == '\0') {
+		if (*set->score_max_header == '\0' &&
+		    *set->score_max_value == '\0') {
 			*error_r = t_strdup_printf(
-				"None of sieve_%s_max_header or sieve_%s_max_value "
-				"is configured", ext_name, ext_name);
+				"None of sieve_%s_score_max_header or "
+				"sieve_%s_score_max_value is configured",
+				ext_name, ext_name);
 			return FALSE;
 		}
-		if (*set->max_value != '\0' &&
+		if (*set->score_max_value != '\0' &&
 		    !ext_spamvirustest_parse_decimal_value(
-			set->max_value, &set->parsed.max_value, &error)) {
+			set->score_max_value, &set->parsed.score_max_value,
+			&error)) {
 			*error_r = t_strdup_printf(
-				"Invalid max value specification "
-				"'%s': %s", set->max_value, error);
+				"Invalid max score value specification "
+				"'%s': %s", set->score_max_value, error);
 			return FALSE;
 		}
 	} else {
@@ -221,7 +225,7 @@ ext_spamvirustest_settings_check(void *_set, bool virustest,
 			}
 			set->parsed.text_values[tv_index] = tvalues[i + 1]; 
 		}
-		set->parsed.max_value = 1;
+		set->parsed.score_max_value = 1;
 	}
 
 	return TRUE;

src/lib-sieve/plugins/spamvirustest/ext-spamvirustest-settings.h

@@ -14,15 +14,15 @@ struct ext_spamvirustest_settings {
 
 	const char *status_header;
 	const char *status_type;
-	const char *max_header;
-	const char *max_value;
+	const char *score_max_header;
+	const char *score_max_value;
 
 	ARRAY_TYPE(const_string) text_value;
 
 	struct {
 		enum ext_spamvirustest_status_type status_type;
 
-		float max_value;
+		float score_max_value;
 
 		const char *text_values[11];
 	} parsed;

tests/extensions/spamvirustest/spamtest.svtest

@@ -25,7 +25,7 @@ Test!
 
 test_config_set "sieve_spamtest_status_header"
 	"X-SpamCheck:[ \\ta-zA-Z]+, score=(-?[0-9]+.[0-9]+)";
-test_config_set "sieve_spamtest_max_header"
+test_config_set "sieve_spamtest_score_max_header"
 	"X-SpamCheck:[ \\ta-zA-Z]+, score=-?[0-9]+.[0-9]+ required=(-?[0-9]+.[0-9]+)";
 test_config_set "sieve_spamtest_status_type" "score";
 test_config_reload :extension "spamtest";
@@ -147,9 +147,9 @@ Test!
 ;
 
 test_config_set "sieve_spamtest_status_header" "X-Spam-Status";
-test_config_set "sieve_spamtest_max_value" "8.0";
+test_config_set "sieve_spamtest_score_max_value" "8.0";
 test_config_set "sieve_spamtest_status_type" "strlen";
-test_config_unset "sieve_spamtest_max_header";
+test_config_unset "sieve_spamtest_score_max_header";
 test_config_reload :extension "spamtest";
 
 test "Strlen: zero" {
@@ -245,8 +245,8 @@ test_config_set "sieve_spamtest_status_header" "X-Spam-Verdict";
 test_config_set "sieve_spamtest_status_type" "text";
 test_config_set "sieve_spamtest_text_value/1" "Not Spam";
 test_config_set "sieve_spamtest_text_value/10" "Spam";
-test_config_unset "sieve_spamtest_max_header";
-test_config_unset "sieve_spamtest_max_value";
+test_config_unset "sieve_spamtest_score_max_header";
+test_config_unset "sieve_spamtest_score_max_value";
 test_config_reload :extension "spamtest";
 
 test "Text: Not Spam" {

tests/extensions/spamvirustest/spamtestplus.svtest

@@ -25,7 +25,7 @@ Test!
 ;
 
 test_config_set "sieve_spamtest_status_header" "X-SpamCheck";
-test_config_set "sieve_spamtest_max_value" "1";
+test_config_set "sieve_spamtest_score_max_value" "1";
 test_config_set "sieve_spamtest_status_type" "score";
 test_config_reload :extension "spamtestplus";