GetStyles response when using Named Styles isn't right

[eeidsness]

When using Named Styles in a map file - using CLASS->GROUP and CLASSGROUP functionality as described in RFC 39, the WMS GetStyles response is not as expected.

I get but a single UserStyle with all of the different Rules (classes) listed. Each Rule has a name, but this is the CLASS->NAME value, and not the CLASS->GROUP reference.

Output:

<StyledLayerDescriptor version="1.0.0" xmlns="http://www.opengis.net/sld" xmlns:gml="http://www.opengis.net/gml" xmlns:ogc="http://www.opengis.net/ogc" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.opengis.net/sld http://schemas.opengis.net/sld/1.0.0/StyledLayerDescriptor.xsd">
<NamedLayer>
<Name>layername</Name>
<UserStyle>
<FeatureTypeStyle>
<Rule>
<Name>Class Name</Name>
<PolygonSymbolizer>
<Fill>
<CssParameter name="fill">#cccc00</CssParameter>
<CssParameter name="fill-opacity">1.00</CssParameter>
</Fill>
</PolygonSymbolizer>
</Rule>
</FeatureTypeStyle>
</UserStyle>
</NamedLayer>
</StyledLayerDescriptor>