summaryrefslogtreecommitdiff
path: root/src/leap/bitmask
diff options
context:
space:
mode:
authorKali Kaneko <kali@futeisha.org>2014-08-19 14:32:14 -0500
committerKali Kaneko <kali@futeisha.org>2014-08-19 14:32:14 -0500
commit0b86cf0beb6796958f3edbe6553f96abf9b879fa (patch)
treec4c26b8e34fe645164506ca0512c43dbe540cbe6 /src/leap/bitmask
parent0d2f86745bcb90e213a636eed9c73604a724c052 (diff)
Enable keyring (fix bad merge for 75eddcf502d2)
Diffstat (limited to 'src/leap/bitmask')
-rw-r--r--src/leap/bitmask/util/keyring_helpers.py4
1 files changed, 0 insertions, 4 deletions
diff --git a/src/leap/bitmask/util/keyring_helpers.py b/src/leap/bitmask/util/keyring_helpers.py
index c580f19e..2b729b65 100644
--- a/src/leap/bitmask/util/keyring_helpers.py
+++ b/src/leap/bitmask/util/keyring_helpers.py
@@ -34,10 +34,6 @@ 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__)