Yes, you are of course right. I did not think. I moved them over and pushed them to master.
> On 22 Aug 2025, at 10:45, Adolf Belka <[email protected]> wrote: > > Hi, > > I saw that this patch had been accepted and put into next (CU198). I had > expected that it would also be put into CU197 Testing as the issue being > fixed is part of the openvpn-2.6 changes. > > Regards, > > Adolf. > > > On 20/08/2025 18:51, Adolf Belka wrote: >> - In the previous version the cgiparams hash was filled from the >> ovpn/settings file. >> However with the new version of this file that is no longer done. For the >> values >> of protocol, redirect_gw, mssfix, dataciphers, route_push the hash file >> was changed >> from %cgiparams to %vpnsettings. This was not done for the values of >> dciphers, dauth >> or tlsauth. These values still got their entries from the %cgiparams hash >> but this >> hash is empty as it has not been filled. >> - This patch replaces the use of $cgiparams with $vpnsettings. >> - Tested this out on my vm testbed and confirmed that the saved values are >> now shown on >> the advanced settings wui page. >> Fixes: bug13869 >> Tested-by: Adolf Belka <[email protected]> >> Signed-off-by: Adolf Belka <[email protected]> >> --- >> html/cgi-bin/ovpnmain.cgi | 6 +++--- >> 1 file changed, 3 insertions(+), 3 deletions(-) >> diff --git a/html/cgi-bin/ovpnmain.cgi b/html/cgi-bin/ovpnmain.cgi >> index 83f9fdc02..3a85c11ac 100644 >> --- a/html/cgi-bin/ovpnmain.cgi >> +++ b/html/cgi-bin/ovpnmain.cgi >> @@ -2694,18 +2694,18 @@ ADV_ERROR: >> $selected{'DCIPHER'}{'CAST5-CBC'} = ''; >> $selected{'DCIPHER'}{'BF-CBC'} = ''; >> $selected{'DCIPHER'}{'DES-CBC'} = ''; >> - $selected{'DCIPHER'}{$cgiparams{'DCIPHER'}} = 'SELECTED'; >> + $selected{'DCIPHER'}{$vpnsettings{'DCIPHER'}} = 'SELECTED'; >> $selected{'DAUTH'}{'whirlpool'} = ''; >> $selected{'DAUTH'}{'SHA512'} = ''; >> $selected{'DAUTH'}{'SHA384'} = ''; >> $selected{'DAUTH'}{'SHA256'} = ''; >> $selected{'DAUTH'}{'SHA1'} = ''; >> - $selected{'DAUTH'}{$cgiparams{'DAUTH'}} = 'SELECTED'; >> + $selected{'DAUTH'}{$vpnsettings{'DAUTH'}} = 'SELECTED'; >> $checked{'TLSAUTH'}{'off'} = ''; >> $checked{'TLSAUTH'}{'on'} = ''; >> - $checked{'TLSAUTH'}{$cgiparams{'TLSAUTH'}} = 'CHECKED'; >> + $checked{'TLSAUTH'}{$vpnsettings{'TLSAUTH'}} = 'CHECKED'; >> &Header::showhttpheaders(); >> &Header::openpage($Lang::tr{'status ovpn'}, 1, ''); > >
