From d9f1d6c0336cd2453162d45049c399597ab8ae26 Mon Sep 17 00:00:00 2001 From: Jarrod Johnson Date: Fri, 11 Oct 2019 13:21:55 -0400 Subject: [PATCH] Fix user/password login in python3 The forced bytes of the function was incompatible with str oriented logic later --- confluent_server/confluent/auth.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/confluent_server/confluent/auth.py b/confluent_server/confluent/auth.py index 6c43d5c3..bd0ef5cb 100644 --- a/confluent_server/confluent/auth.py +++ b/confluent_server/confluent/auth.py @@ -28,6 +28,7 @@ import hashlib import hmac import multiprocessing import confluent.userutil as userutil +import confluent.util as util pam = None try: import confluent.pam as pam @@ -133,6 +134,9 @@ def _get_usertenant(name, tenant=False): else: # assume it is a non-tenant user account user = name tenant = None + user = util.stringify(user) + if tenant: + tenant = util.stringify(tenant) yield user yield tenant