summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornicolargo <nicolas@nicolargo.com>2022-10-23 15:56:36 +0200
committernicolargo <nicolas@nicolargo.com>2022-10-30 14:51:56 +0100
commit76dd873ebebaca018236b63a7ba9c927626c6535 (patch)
tree57d6184b3be8f6df585e8a81d9b7b3cb28bde0f5
parentffd275bafab0e3f63a578cffdf21eafc18a39918 (diff)
Since the last update, using Glances with a password fails with a Python error / Correct another issue with user_config_dir
-rw-r--r--glances/outputs/glances_bottle.py3
-rw-r--r--glances/password.py2
2 files changed, 3 insertions, 2 deletions
diff --git a/glances/outputs/glances_bottle.py b/glances/outputs/glances_bottle.py
index 27ec92dc..cdc54f0e 100644
--- a/glances/outputs/glances_bottle.py
+++ b/glances/outputs/glances_bottle.py
@@ -127,7 +127,8 @@ class GlancesBottle(object):
if username == self.args.username:
from glances.password import GlancesPassword
- pwd = GlancesPassword()
+ pwd = GlancesPassword(username=username,
+ config=self.config)
return pwd.check_password(self.args.password, pwd.sha256_hash(password))
else:
return False
diff --git a/glances/password.py b/glances/password.py
index 9a19dbe1..b34c13e0 100644
--- a/glances/password.py
+++ b/glances/password.py
@@ -39,7 +39,7 @@ class GlancesPassword(object):
Related toissue: Password files in same configuration dir in effect #2143
"""
if self.config is None:
- return user_config_dir
+ return user_config_dir()
else:
return self.config.get_value('passwords',
'local_password_path',