MINOR: avoid duplicate force-sslv3 on server serialization

hdurand0710 · hdurand0710 · commit ea6050a0cad9 · 2025-11-27T10:27:56.000+01:00
diff --git a/configuration/server.go b/configuration/server.go
@@ -639,16 +639,13 @@ func SerializeServerParams(s models.ServerParams, opt *options.ConfigurationOpti
 	} else if s.Renegotiate == "disabled" {
 		options = append(options, &params.ServerOptionWord{Name: "no-renegotiate"})
 	}
-	if s.Sslv3 == "enabled" {
+	if s.Sslv3 == "enabled" || s.ForceSslv3 == "enabled" {
 		options = append(options, &params.ServerOptionWord{Name: "force-sslv3"})
 	}
 	if s.Sslv3 == "disabled" ||
 		s.NoSslv3 == "enabled" { // deprecated, keeping the behavior, for backward compatibility. Can be removed when field is removed
 		options = append(options, &params.ServerOptionWord{Name: "no-sslv3"})
 	}
-	if s.ForceSslv3 == "enabled" {
-		options = append(options, &params.ServerOptionWord{Name: "force-sslv3"})
-	}
 	if s.ForceSslv3 == "disabled" ||
 		s.NoSslv3 == "enabled" { // deprecated, keeping the behavior, for backward compatibility. Can be removed when field is removed
 		options = append(options, &params.ServerOptionWord{Name: "no-sslv3"})

Original file line number	Diff line number	Diff line change
`@@ -639,16 +639,13 @@ func SerializeServerParams(s models.ServerParams, opt *options.ConfigurationOpti`
`639`	`639`	`} else if s.Renegotiate == "disabled" {`
`640`	`640`	`options = append(options, &params.ServerOptionWord{Name: "no-renegotiate"})`
`641`	`641`	`}`
`642`		`- if s.Sslv3 == "enabled" {`
	`642`	`+ if s.Sslv3 == "enabled" \|\| s.ForceSslv3 == "enabled" {`
`643`	`643`	`options = append(options, &params.ServerOptionWord{Name: "force-sslv3"})`
`644`	`644`	`}`
`645`	`645`	`if s.Sslv3 == "disabled" \|\|`
`646`	`646`	`s.NoSslv3 == "enabled" { // deprecated, keeping the behavior, for backward compatibility. Can be removed when field is removed`
`647`	`647`	`options = append(options, &params.ServerOptionWord{Name: "no-sslv3"})`
`648`	`648`	`}`
`649`		`- if s.ForceSslv3 == "enabled" {`
`650`		`- options = append(options, &params.ServerOptionWord{Name: "force-sslv3"})`
`651`		`- }`
`652`	`649`	`if s.ForceSslv3 == "disabled" \|\|`
`653`	`650`	`s.NoSslv3 == "enabled" { // deprecated, keeping the behavior, for backward compatibility. Can be removed when field is removed`
`654`	`651`	`options = append(options, &params.ServerOptionWord{Name: "no-sslv3"})`