diff options
author | kali <kali@katsi> | 2014-07-25 11:39:19 -0500 |
---|---|---|
committer | kali <kali@katsi> | 2014-07-25 11:39:19 -0500 |
commit | c4832d322c6ab71edab14643a77d9f1bd099a458 (patch) | |
tree | 52717110f5ba4bfefe56ee5c2f0ad9f6ac7cc31e /src/leap/bitmask/util | |
parent | 675e4ed10f173088423bf07e3f0ba651cdb8b13c (diff) | |
parent | dbfcb48a5d4d3aee80ed8dd7b20e61994ddbb667 (diff) |
Merge tag '0.5.4' into deb-0.5.4
Tag leap.bitmask version 0.5.4
Diffstat (limited to 'src/leap/bitmask/util')
-rw-r--r-- | src/leap/bitmask/util/keyring_helpers.py | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/leap/bitmask/util/keyring_helpers.py b/src/leap/bitmask/util/keyring_helpers.py index ee2d7a1c..0512d988 100644 --- a/src/leap/bitmask/util/keyring_helpers.py +++ b/src/leap/bitmask/util/keyring_helpers.py @@ -34,6 +34,10 @@ except Exception: # dbus socket, or stuff like that. keyring = None +# XXX remember password disabled right now! +# see: https://leap.se/code/issues/4190 +keyring = None + logger = logging.getLogger(__name__) @@ -46,7 +50,7 @@ def _get_keyring_with_fallback(): This is a workaround for the cases in which the keyring module chooses an insecure keyring by default (ie, inside a virtualenv). """ - if not keyring: + if keyring is None: return None kr = keyring.get_keyring() if not canuse(kr): @@ -67,7 +71,7 @@ def has_keyring(): :rtype: bool """ - if not keyring: + if keyring is None: return False kr = _get_keyring_with_fallback() return canuse(kr) @@ -79,7 +83,7 @@ def get_keyring(): :rtype: keyringBackend or None """ - if not keyring: + if keyring is None: return False kr = _get_keyring_with_fallback() return kr if canuse(kr) else None |