From: Noel Power <noel.power@suse.com>
Date: Tue, 2 Oct 2018 13:45:53 +0000 (+0100)
Subject: s4/scripting/bin: PY3 make sure GUID result of format is string
X-Git-Tag: tdb-1.3.17~1234
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1a4e95da2b57c43c89a08aae18765ebf5a7f0f88;p=thirdparty%2Fsamba.git

s4/scripting/bin: PY3 make sure GUID result of format is string

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

diff --git a/source4/scripting/bin/samba_dnsupdate b/source4/scripting/bin/samba_dnsupdate
index ccf44c5995d..ae355e9ec4e 100755
--- a/source4/scripting/bin/samba_dnsupdate
+++ b/source4/scripting/bin/samba_dnsupdate
@@ -49,6 +49,7 @@ from samba.dcerpc import netlogon, winbind
 from samba.netcmd.dns import cmd_dns
 from samba import gensec
 from samba.kcc import kcc_utils
+from samba.compat import get_string
 import ldb
 
 samba.ensure_third_party_module("dns", "dnspython")
@@ -375,7 +376,7 @@ def get_subst_vars(samdb):
     vars['SITE']      = samdb.server_site_name()
     res = samdb.search(base=samdb.get_default_basedn(), scope=SCOPE_BASE, attrs=["objectGUID"])
     guid = samdb.schema_format_value("objectGUID", res[0]['objectGUID'][0])
-    vars['DOMAINGUID'] = guid
+    vars['DOMAINGUID'] = get_string(guid)
 
     vars['IF_DC'] = ""
     vars['IF_RWDC'] = "# "
diff --git a/source4/scripting/bin/samba_spnupdate b/source4/scripting/bin/samba_spnupdate
index 888b37f4c34..69de3819751 100755
--- a/source4/scripting/bin/samba_spnupdate
+++ b/source4/scripting/bin/samba_spnupdate
@@ -41,6 +41,7 @@ from samba import getopt as options
 from samba.auth import system_session
 from samba.samdb import SamDB
 from samba.credentials import Credentials, DONT_USE_KERBEROS
+from samba.compat import get_string
 
 parser = optparse.OptionParser("samba_spnupdate")
 sambaopts = options.SambaOptions(parser)
@@ -79,7 +80,7 @@ def get_subst_vars(samdb):
     vars['NTDSGUID']  = samdb.get_ntds_GUID()
     res = samdb.search(base=samdb.get_default_basedn(), scope=ldb.SCOPE_BASE, attrs=["objectGUID"])
     guid = samdb.schema_format_value("objectGUID", res[0]['objectGUID'][0])
-    vars['DOMAINGUID'] = guid
+    vars['DOMAINGUID'] = get_string(guid)
     return vars
 
 try: