summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorSol Jerome <sol.jerome@gmail.com>2012-08-30 08:56:28 -0500
committerSol Jerome <sol.jerome@gmail.com>2012-08-30 08:57:40 -0500
commitf524df50219a88e3410749f245bd907cf23ba128 (patch)
treefb99cb20283257bb0a2101d512e8621bb3b3869a /src
parent9697cf36e4746c55c6d04bc5230dd3b0e34159a2 (diff)
downloadbcfg2-f524df50219a88e3410749f245bd907cf23ba128.tar.gz
bcfg2-f524df50219a88e3410749f245bd907cf23ba128.tar.bz2
bcfg2-f524df50219a88e3410749f245bd907cf23ba128.zip
Metadata: Fix byte string comparison in py3k
Signed-off-by: Sol Jerome <sol.jerome@gmail.com>
Diffstat (limited to 'src')
-rw-r--r--src/lib/Bcfg2/Server/Plugins/Metadata.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/lib/Bcfg2/Server/Plugins/Metadata.py b/src/lib/Bcfg2/Server/Plugins/Metadata.py
index baa2bd0be..2d095ed0a 100644
--- a/src/lib/Bcfg2/Server/Plugins/Metadata.py
+++ b/src/lib/Bcfg2/Server/Plugins/Metadata.py
@@ -1054,6 +1054,8 @@ class Metadata(Bcfg2.Server.Plugin.Metadata,
def AuthenticateConnection(self, cert, user, password, address):
"""This function checks auth creds."""
+ if not isinstance(user, str):
+ user = user.decode('utf-8')
if cert:
id_method = 'cert'
certinfo = dict([x[0] for x in cert['subject']])