From: Noel Power <noel.power@suse.com>
Date: Mon, 3 Sep 2018 16:56:56 +0000 (+0100)
Subject: s4/torture/drs: PY3 port for samba4.drs.replica_sync_rodc
X-Git-Tag: tdb-1.3.17~1723
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2b4d2810eb8017866816069d37fd2f48790e8055;p=thirdparty%2Fsamba.git

s4/torture/drs: PY3 port for samba4.drs.replica_sync_rodc

Signed-off-by: Noel Power <noel.power@suse.com>
Reviewed-by: Andrew Bartlett abartlet@samba.org
---

diff --git a/python/samba/drs_utils.py b/python/samba/drs_utils.py
index 7573b62b11c..05a9df7792e 100644
--- a/python/samba/drs_utils.py
+++ b/python/samba/drs_utils.py
@@ -168,7 +168,7 @@ def drs_get_rodc_partial_attribute_set(samdb):
                               "searchFlags"])
 
     for r in res:
-        ldap_display_name = r["lDAPDisplayName"][0]
+        ldap_display_name = str(r["lDAPDisplayName"][0])
         if "systemFlags" in r:
             system_flags      = r["systemFlags"][0]
             if (int(system_flags) & (samba.dsdb.DS_FLAG_ATTR_NOT_REPLICATED |
diff --git a/source4/torture/drs/python/replica_sync_rodc.py b/source4/torture/drs/python/replica_sync_rodc.py
index 1e02610f434..f439e732ca1 100644
--- a/source4/torture/drs/python/replica_sync_rodc.py
+++ b/source4/torture/drs/python/replica_sync_rodc.py
@@ -32,6 +32,7 @@ import drs_base
 import samba.tests
 import time
 import ldb
+from samba.compat import get_string
 
 from ldb import (
     SCOPE_BASE, LdbError, ERR_NO_SUCH_OBJECT)
@@ -62,7 +63,7 @@ objectClass: organizationalUnit
         samdb.add_ldif(ldif)
         res = samdb.search(base="%s,%s" % (name, self.domain_dn),
                            scope=SCOPE_BASE, attrs=["objectGUID"])
-        return self._GUID_string(res[0]["objectGUID"][0])
+        return get_string(self._GUID_string(res[0]["objectGUID"][0]))
 
     def _check_deleted(self, sam_ldb, guid):
         # search the user by guid as it may be deleted