python/samba/netcmd: PY3 fix samba4.blackbox.trust_utils test
authorNoel Power <noel.power@suse.com>
Mon, 5 Nov 2018 13:56:48 +0000 (13:56 +0000)
committerNoel Power <npower@samba.org>
Mon, 10 Dec 2018 09:38:21 +0000 (10:38 +0100)
In python3 we are using ldb.bytes where we need strings
Signed-off-by: Noel Power <noel.power@suse.com>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
python/samba/netcmd/domain.py

index 82e6ece5529dc4f2e6c8dab83e9a6c4bc19ff300..9c5ae21fdd744d1cd04cbf4f2f7fc494c04b805c 100644 (file)
@@ -3463,7 +3463,7 @@ class cmd_domain_trust_namespaces(DomainTrustCommand):
 
             for upn in add_upn:
                 for i, v in enumerate(update_upn_vals):
-                    if v.lower() == upn.lower():
+                    if str(v).lower() == upn.lower():
                         raise CommandError("Entry already present for "
                                            "value[%s] specified for "
                                            "--add-upn-suffix" % upn)
@@ -3473,7 +3473,7 @@ class cmd_domain_trust_namespaces(DomainTrustCommand):
             for upn in delete_upn:
                 idx = None
                 for i, v in enumerate(update_upn_vals):
-                    if v.lower() != upn.lower():
+                    if str(v).lower() != upn.lower():
                         continue
                     idx = i
                     break
@@ -3485,7 +3485,7 @@ class cmd_domain_trust_namespaces(DomainTrustCommand):
 
             for spn in add_spn:
                 for i, v in enumerate(update_spn_vals):
-                    if v.lower() == spn.lower():
+                    if str(v).lower() == spn.lower():
                         raise CommandError("Entry already present for "
                                            "value[%s] specified for "
                                            "--add-spn-suffix" % spn)
@@ -3495,7 +3495,7 @@ class cmd_domain_trust_namespaces(DomainTrustCommand):
             for spn in delete_spn:
                 idx = None
                 for i, v in enumerate(update_spn_vals):
-                    if v.lower() != spn.lower():
+                    if str(v).lower() != spn.lower():
                         continue
                     idx = i
                     break