summaryrefslogtreecommitdiff
path: root/src/leap/bitmask/util
diff options
context:
space:
mode:
authorIvan Alejandro <ivanalejandro0@gmail.com>2014-07-31 14:52:06 -0300
committerIvan Alejandro <ivanalejandro0@gmail.com>2014-07-31 14:52:06 -0300
commit429cc2681e74785e3e88b270730e246f3f9f3ce7 (patch)
tree8aa9f8a1a9c1f77098337442eac77d52c720b214 /src/leap/bitmask/util
parent87869ff34efce43a331d238db64b768b616b129a (diff)
parent75eddcf502d23f761cbac26da34fcfd1ab669b8b (diff)
Merge remote-tracking branch 'chiiph/bug/properly_enable_keyring' into develop
Diffstat (limited to 'src/leap/bitmask/util')
-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 0512d988..088e7b3d 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__)