always use bytes() for UUID() constructor in ldap.syncrepl

ECN · Nov 22, 2017 · 707744c · 707744c
1 parent c25fe47
commit 707744c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/CHANGES b/CHANGES
@@ -13,6 +13,7 @@ Lib/
 * right after importing _ldap there is a call into libldap to initialize it
 * method .decodeControlValue() of SSSResponseControl and VLVResponseControl
   does not set class attribute result_code anymore
+* always use bytes() for UUID() constructor in ldap.syncrepl
 
 Tests/
 * scripts do not directly call SlapdTestCase.setUpClass() anymore

diff --git a/Lib/ldap/syncrepl.py b/Lib/ldap/syncrepl.py
@@ -130,7 +130,7 @@ class SyncStateControl(ResponseControl):
     def decodeControlValue(self, encodedControlValue):
         d = decoder.decode(encodedControlValue, asn1Spec = syncStateValue())
         state = d[0].getComponentByName('state')
-        uuid = UUID(bytes=d[0].getComponentByName('entryUUID'))
+        uuid = UUID(bytes=bytes(d[0].getComponentByName('entryUUID')))
         cookie = d[0].getComponentByName('cookie')
         if cookie.hasValue():
             self.cookie = str(self.cookie)
@@ -287,7 +287,7 @@ def __init__(self, encodedMessage):
                     uuids = []
                     ids = comp.getComponentByName('syncUUIDs')
                     for i in range(len(ids)):
-                        uuid = UUID(bytes=str(ids.getComponentByPosition(i)))
+                        uuid = UUID(bytes=bytes(ids.getComponentByPosition(i)))
                         uuids.append(str(uuid))
                     val['syncUUIDs'] = uuids
                     val['refreshDeletes'] = bool(comp.getComponentByName('refreshDeletes'))