This commit is contained in:
Quentin McGaw
2020-06-18 18:05:51 +00:00
parent 5a6cf0fe3a
commit cdbb7bf771
4 changed files with 12 additions and 7 deletions

View File

@@ -59,11 +59,12 @@ func GetAllSettings(paramsReader params.Reader) (settings Settings, err error) {
if err != nil {
return settings, err
}
settings.OpenVPN, err = GetOpenVPNSettings(paramsReader)
isMullvad := settings.VPNSP == constants.Mullvad
settings.OpenVPN, err = GetOpenVPNSettings(paramsReader, !isMullvad)
if err != nil {
return settings, err
}
if settings.VPNSP == constants.Mullvad {
if isMullvad {
settings.OpenVPN.Password = "m"
}
settings.DNS, err = GetDNSSettings(paramsReader)