From 0b86cf0beb6796958f3edbe6553f96abf9b879fa Mon Sep 17 00:00:00 2001
From: Kali Kaneko <kali@futeisha.org>
Date: Tue, 19 Aug 2014 14:32:14 -0500
Subject: Enable keyring (fix bad merge for 75eddcf502d2)

---
 src/leap/bitmask/util/keyring_helpers.py | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'src/leap/bitmask/util/keyring_helpers.py')

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__)
 
-- 
cgit v1.2.3