From 89eb162fcd60861ed4c628dab4e1aaf10c6160bb Mon Sep 17 00:00:00 2001
From: Fraser Tweedale <ftweedal@redhat.com>
Date: Jun 02 2017 07:55:13 +0000
Subject: py3: fix regression in schemaupdate


The python-ldap classes that process schema definitions require a
unicode string, not a byte string.  A recent py3 compatibility fix
(d89de4219d0e8ee33e81d6b6d1bc6c22ac9ffbaa) changed the constructor
argument to a unicode string to dispel a warning, but this broke
schema update.  Change it back to a bytestring.

Part of: https://fedorahosted.org/freeipa/ticket/4985

Reviewed-By: Martin Basti <mbasti@redhat.com>

---

diff --git a/ipaserver/install/schemaupdate.py b/ipaserver/install/schemaupdate.py
index 935e576..6efbb1f 100644
--- a/ipaserver/install/schemaupdate.py
+++ b/ipaserver/install/schemaupdate.py
@@ -119,7 +119,7 @@ def update_schema(schema_files, ldapi=False, dm_password=None,):
 
     # The exact representation the DS gives us for each OID
     # (for debug logging)
-    old_entries_by_oid = {cls(attr.decode('utf-8')).oid: attr.decode('utf-8')
+    old_entries_by_oid = {cls(attr).oid: attr.decode('utf-8')
                           for (attrname, cls) in SCHEMA_ELEMENT_CLASSES
                           for attr in schema_entry[attrname]}