diff options
| author | Kali Kaneko <kali@leap.se> | 2016-08-31 10:14:34 -0400 |
|---|---|---|
| committer | Kali Kaneko <kali@leap.se> | 2016-08-31 10:14:34 -0400 |
| commit | 19d8c4e630fb34778fdf764a89a3768842ea4bf1 (patch) | |
| tree | 37dd88a16aa8826b45aee777bdf5a983f2e61e82 | |
| parent | e7148c4f577ba5de4930eca1da7e32e8c610f66a (diff) | |
| parent | 58c00ee0a92fd7f0bdd4ae930e936ac20fd47e39 (diff) | |
Merge branch 'develop' into debian/platform-0.9
| -rw-r--r-- | src/leap/mx/couchdbhelper.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/leap/mx/couchdbhelper.py b/src/leap/mx/couchdbhelper.py index f17466d..50275ca 100644 --- a/src/leap/mx/couchdbhelper.py +++ b/src/leap/mx/couchdbhelper.py @@ -100,7 +100,8 @@ class ConnectedCouchDB(client.CouchDB): pubkey = None if result["rows"]: doc = result["rows"][0]["doc"] - if "enabled" not in doc or doc["enabled"]: + user_enabled = doc.get('enabled', True) + if user_enabled: uuid = doc["user_id"] if "keys" in doc: pubkey = doc["keys"]["pgp"] |