Bug 1630674 - Port bug 1628487: Locked Socks V5 shouldn't enable. r=mkmelin DONTBUILD
authorRichard Marti <richard.marti@gmail.com>
Fri, 17 Apr 2020 20:18:08 +0300
changeset 38869 7279efc95afdd0469ad75d5efeb0cf73cff86058
parent 38868 c1122301facced56c709208efb7880f9d8b1a7fc
child 38870 9b6973ce47f508484a09c6a971ec947395bd5431
push id401
push userclokep@gmail.com
push dateMon, 01 Jun 2020 20:41:59 +0000
reviewersmkmelin
bugs1630674, 1628487
Bug 1630674 - Port bug 1628487: Locked Socks V5 shouldn't enable. r=mkmelin DONTBUILD Port of https://hg.mozilla.org/mozilla-central/rev/dcf5c51cd81e
mail/components/preferences/connection.js
--- a/mail/components/preferences/connection.js
+++ b/mail/components/preferences/connection.js
@@ -240,17 +240,18 @@ var gConnectionsDialog = {
   },
 
   updateDNSPref() {
     var socksVersionPref = Preferences.get("network.proxy.socks_version");
     var socksDNSPref = Preferences.get("network.proxy.socks_remote_dns");
     var proxyTypePref = Preferences.get("network.proxy.type");
     var isDefinitelySocks4 =
       !socksVersionPref.disabled && socksVersionPref.value == 4;
-    socksDNSPref.disabled = isDefinitelySocks4 || proxyTypePref.value == 0;
+    socksDNSPref.disabled =
+      isDefinitelySocks4 || proxyTypePref.value == 0 || socksDNSPref.locked;
     return undefined;
   },
 
   updateReloadButton() {
     // Disable the "Reload PAC" button if the selected proxy type is not PAC or
     // if the current value of the PAC textbox does not match the value stored
     // in prefs.  Likewise, disable the reload button if PAC is not configured
     // in prefs.